Author: pfg
Date: Thu Sep 27 20:06:37 2012
New Revision: 241008
URL: http://svn.freebsd.org/changeset/base/241008

Log:
  Complete revert of r239963:
  
  The attempt to merge changes from the linux libtirpc caused
  rpc.lockd to exit after startup under unclear conditions.
  
  After many hours of selective experiments and inconsistent results
  the conclusion is that it's better to just revert everything and
  restart in a future time with a much smaller subset of the
  changes.
  ____
  
  MFC after:    3 days
  Reported by:  David Wolfskill
  Tested by:    David Wolfskill

Modified:
  head/include/rpc/auth.h
  head/include/rpc/auth_unix.h

Modified: head/include/rpc/auth.h
==============================================================================
--- head/include/rpc/auth.h     Thu Sep 27 19:10:25 2012        (r241007)
+++ head/include/rpc/auth.h     Thu Sep 27 20:06:37 2012        (r241008)
@@ -243,13 +243,14 @@ __END_DECLS
  * System style authentication
  * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
  *     char *machname;
- *     uid_t uid;
- *     gid_t gid;
+ *     int uid;
+ *     int gid;
  *     int len;
- *     gid_t *aup_gids;
+ *     int *aup_gids;
  */
 __BEGIN_DECLS
-extern AUTH *authunix_create(char *, uid_t, gid_t, int, gid_t *);
+extern AUTH *authunix_create(char *, int, int, int,
+    int *);
 extern AUTH *authunix_create_default(void);    /* takes no parameters */
 extern AUTH *authnone_create(void);            /* takes no parameters */
 __END_DECLS

Modified: head/include/rpc/auth_unix.h
==============================================================================
--- head/include/rpc/auth_unix.h        Thu Sep 27 19:10:25 2012        
(r241007)
+++ head/include/rpc/auth_unix.h        Thu Sep 27 20:06:37 2012        
(r241008)
@@ -60,10 +60,10 @@
 struct authunix_parms {
        u_long   aup_time;
        char    *aup_machname;
-       uid_t    aup_uid;
-       gid_t    aup_gid;
+       int      aup_uid;
+       int      aup_gid;
        u_int    aup_len;
-       gid_t   *aup_gids;
+       int     *aup_gids;
 };
 
 #define authsys_parms authunix_parms
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to