diff options
| -rw-r--r-- | crypto/heimdal/appl/su/Makefile.am | 4 | ||||
| -rw-r--r-- | crypto/heimdal/appl/su/su.c | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/crypto/heimdal/appl/su/Makefile.am b/crypto/heimdal/appl/su/Makefile.am index 86e8533..357152e 100644 --- a/crypto/heimdal/appl/su/Makefile.am +++ b/crypto/heimdal/appl/su/Makefile.am @@ -5,10 +5,6 @@ include $(top_srcdir)/Makefile.am.common INCLUDES += $(INCLUDE_krb4) $(INCLUDE_des) -.if defined(_FREEFALL_CONFIG) -CFLAGS+=-D_FREEFALL_CONFIG -.endif - bin_PROGRAMS = su bin_SUIDS = su su_SOURCES = su.c diff --git a/crypto/heimdal/appl/su/su.c b/crypto/heimdal/appl/su/su.c index d44cf1b..757f39d 100644 --- a/crypto/heimdal/appl/su/su.c +++ b/crypto/heimdal/appl/su/su.c @@ -197,20 +197,12 @@ krb5_verify(const struct passwd *login_info, NULL); else ret = krb5_make_principal(context, &p, NULL, -#ifdef _FREEFALL_CONFIG - login_name, -#else su_info->pw_name, -#endif NULL); if(ret) return 1; - if( -#ifndef _FREEFALL_CONFIG - su_info->pw_uid != 0 || -#endif - krb5_kuserok(context, p, su_info->pw_name)) { + if(su_info->pw_uid != 0 || krb5_kuserok(context, p, su_info->pw_name)) { ret = krb5_cc_gen_new(context, &krb5_mcc_ops, &ccache); if(ret) { #if 1 @@ -442,11 +434,7 @@ main(int argc, char **argv) ok = 4; #endif - if(ok == 0 && login_info->pw_uid -#ifndef _FREEFALL_CONFIG - && verify_unix(su_info) != 0 -#endif - ) { + if(ok == 0 && login_info->pw_uid && verify_unix(su_info) != 0) { printf("Sorry!\n"); exit(1); } |
