accept_sec_context.c (krb5_gss_accept_sec_context): Remove dead code

	which used geteuid().

Makefile.in (gssapi_err_krb5.$(OBJEXT)): Add Windows production to add
	file to library.

pname_to_uid.c: Don't try to compile pname_to_uid.c for MS-DOS
	or Macintosh.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7555 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 87b9ca34a65e9642feda07a2f78f22e13ed53a06..6f6b86c3d48bfd13d5e0625aa06f9b3f82acd86b 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,14 @@
+Tue Feb 27 17:53:22 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+       * accept_sec_context.c (krb5_gss_accept_sec_context): Remove dead
+               code which used geteuid().
+
+       * Makefile.in (gssapi_err_krb5.$(OBJEXT)): Add Windows production
+               to add file to library.
+
+       * pname_to_uid.c: Don't try to compile pname_to_uid.c for MS-DOS
+               or Macintosh.
+
 Mon Feb 26 18:08:57 1996  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * k5mech.c : do not declare kg_context static as it is declared in another file, and declared extern in a header.

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 846e8f19f3eaf73141e4684c4c6469c226bd5693..2cc9f8733539b309c84968173b818237394da235 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -23,6 +23,11 @@ ETHDRS= gssapi_err_krb5.h
 gssapi_err_krb5.$(OBJEXT): gssapi_err_krb5.c
        $(CC) $(CFLAGS) -c $*.c
 @SHARED_RULE_LOCAL@
+##DOS!if defined(LIBNAME)
+##DOS!if "$(LIBCMD)"!="rem"
+##DOS  $(LIBCMD) /nologo $(LIBNAME) -+$@;
+##DOS!endif
+##DOS!endif
 
 gssapi_err_krb5.h: gssapi_err_krb5.et
 

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index b083a74f70778a9077195e9cff98197d42ea650f..7c0d11743c7bb4332982f78b43e958ad173fa818 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -23,7 +23,6 @@
 #include "gssapiP_krb5.h"
 #include "rsa-md5.h"
 #include <memory.h>
-#include <pwd.h>
 
 /* Decode, decrypt and store the forwarded creds in the local ccache. */
 static krb5_error_code
@@ -96,8 +95,6 @@ krb5_gss_accept_sec_context(ct, minor_status, context_handle,
    krb5_ticket * ticket = NULL;
    int option_id;
    krb5_data option;
-   char user_id [1024];
-   struct passwd *pw_entry;
    krb5_auth_context auth_context_cred = NULL;
 
 
@@ -270,9 +267,6 @@ krb5_gss_accept_sec_context(ct, minor_status, context_handle,
                    TREAD_STR(ptr, ptr2, bigend);
                    option.data = (char FAR *) ptr2;
 
-                   pw_entry = getpwuid(geteuid());
-                   strcpy(user_id, pw_entry->pw_name);
-
                    /* get a temporary auth_context structure for the
                       call to rd_and_store_for_creds() and clear its flags */
 

diff --git a/src/lib/gssapi/krb5/k5mech.c b/src/lib/gssapi/krb5/k5mech.c
index 6f0f35a0cefc626c58bb6268a3c59a9031fdd775..3855b96f099f69d4e5048ef7ed281c7a774f7bf4 100644 (file)
--- a/src/lib/gssapi/krb5/k5mech.c
+++ b/src/lib/gssapi/krb5/k5mech.c
@@ -11,7 +11,6 @@
 #include "../mechglue/mglueP.h"
 
 #include "gssapiP_krb5.h"
-
 /*
  * These are the extern declarations, one group per mechanism. They are
  * contained in the files named <mech>_gssd_extern_srvr.conf.

diff --git a/src/lib/gssapi/krb5/pname_to_uid.c b/src/lib/gssapi/krb5/pname_to_uid.c
index 1da331fb1a809d2bba426c164a2a2829745641d7..0beca8742d4b39e9f31ac6ef8feada449b59491c 100644 (file)
--- a/src/lib/gssapi/krb5/pname_to_uid.c
+++ b/src/lib/gssapi/krb5/pname_to_uid.c
@@ -25,12 +25,14 @@
 
 #include "gssapiP_krb5.h"
 #include <gssapi/gssapi.h>
+#if !defined(_MSDOS) && !defined(_MACINTOSH)
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 #include <string.h>
 #include <pwd.h>
 #include <sys/types.h>
+#endif /* !_MSDOS && !_MACINTOSH */
 
 /* 
  * This function will probably get replaced with the gsscred stuff...
@@ -44,6 +46,9 @@ gss_OID name_type;
 gss_OID mech_type;
 uid_t * uid;
 {
+#if defined(_MSDOS) || defined(_MACINTOSH)
+       return (0);             /* failure */
+#else
 
        struct passwd   *pw;
        static unsigned char    krb5principalname[] =
@@ -85,4 +90,6 @@ uid_t * uid;
        } else {
                return(0);
        }
+       
+#endif
 }