Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / etc / afpd / uid.c

diff --git a/etc/afpd/uid.c b/etc/afpd/uid.c
index 1ace8a0beed5289149ae212c71ded8e918a2fe5e..a3e4d59704592e9626734bdde323a992953241b1 100644 (file)
--- a/etc/afpd/uid.c
+++ b/etc/afpd/uid.c
@@ -1,5 +1,4 @@
 /*
- * $Id: uid.c,v 1.1 2001-01-02 23:00:35 rufustfirefly Exp $
  * code: jeff@univrel.pr.uconn.edu
  *
  * These functions are abstracted here, so that all calls for resolving
@@ -9,94 +8,5 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+#endif /* HAVE_CONFIG_H */
 
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-
-/* functions for username and group */
-#include <pwd.h>
-#include <grp.h>
-#include "uid.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-void save_uidgid ( pair )
-       uidgidset *pair;
-{
-       (pair)->uid = geteuid ();
-       (pair)->gid = getegid ();
-} /* end function void save_uidgid ( pair ) */
-
-void restore_uidgid ( pair )
-       uidgidset *pair;
-{
-       if ( seteuid ( (pair)->uid ) < 0 )
-               syslog ( LOG_ERR, "restore_uidgid: unable to seteuid '%s': %m",
-                       (pair)->uid );
-       if ( setegid ( (pair)->gid ) < 0 )
-               syslog ( LOG_ERR, "restore_uidgid: unable to setegid '%s': %m",
-                       (pair)->gid );
-} /* end function void restore_uidgid ( pair ) */
-
-void set_uidgid ( this_volume )
-       struct vol      *this_volume;
-{
-       int             uid, gid;   /* derived ones go in here */
-
-       /* check to see if we have to switch users */
-       if ( uid = user_to_uid ( (this_volume)->v_forceuid ) ) {
-               if ( seteuid ( uid ) < 0 )
-                       syslog ( LOG_ERR, "set_uidgid: unable to seteuid '%s': %m",
-                               (this_volume)->v_forceuid );
-       } /* end of checking for (this_volume)->v_forceuid */
-
-       /* check to see if we have to switch groups */
-       if ( gid = group_to_gid ( (this_volume)->v_forcegid ) ) {
-               if ( seteuid ( gid ) < 0 )
-                       syslog ( LOG_ERR, "set_uidgid: unable to setegid '%s': %m",
-                               (this_volume)->v_forcegid );
-       } /* end of checking for (this_volume)->v_forcegid */
-
-} /* end function void set_uidgid ( username, group ) */
-
-int user_to_uid ( username )
-       char    *username;
-{
-       struct passwd *this_passwd;
-
-       /* check for anything */
-       if ( strlen ( username ) < 1 ) return 0;
-
-       /* grab the /etc/passwd record relating to username */
-       this_passwd = getpwnam ( username );
-
-       /* return false if there is no structure returned */
-       if (this_passwd == NULL) return 0;
-
-       /* return proper uid */
-       return this_passwd->pw_uid;
-
-} /* end function int user_to_uid ( username ) */
-
-int group_to_gid ( group )
-       char    *group;
-{
-       struct group *this_group;
-
-       /* check for anything */
-       if ( strlen ( group ) < 1 ) return 0;
-
-       /* grab the /etc/groups record relating to group */
-       this_group = getgrnam ( group );
-
-       /* return false if there is no structure returned */
-       if (this_group == NULL) return 0;
-
-       /* return proper gid */
-       return this_group->gr_gid;
-
-} /* end function int group_to_gid ( group ) */