system_cmds-597.90.1.tar.gz

[apple/system_cmds.git] / passwd.tproj / nis_passwd.c

diff --git a/passwd.tproj/nis_passwd.c b/passwd.tproj/nis_passwd.c
index 8be20444a5b621d29567aebbc7b384a770ad3a47..2ab200053696e9998cb2f983aea5679d620646fc 100644 (file)
--- a/passwd.tproj/nis_passwd.c
+++ b/passwd.tproj/nis_passwd.c
@@ -3,22 +3,21 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * "Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 1.0 (the 'License').  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License."
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -57,6 +56,9 @@
  * SUCH DAMAGE.
  */
 
+#include "passwd.h"
+
+#ifdef INFO_NIS
 
 /* update a user's password in NIS. This was based on the Sun implementation
  * we used in NEXTSTEP, although I've added some stuff from OpenBSD. And
@@ -85,6 +87,7 @@ extern int getrpcport(char *, int, int, int);
 extern void getpasswd(char *, int, int, int, int, char *, char **, char**, char **);
 
 static struct passwd *ypgetpwnam(char *name, char *domain);
+static struct passwd *interpret(struct passwd *pwent, char *line);
 
 int nis_passwd(char *uname, char *domain)
 {      
@@ -164,7 +167,7 @@ int nis_passwd(char *uname, char *domain)
        tv.tv_sec = 2;
        tv.tv_usec = 0;
        ans = clnt_call(cl, YPPASSWDPROC_UPDATE,
-               xdr_yppasswd, &yppasswd, xdr_int, &ok, tv);
+               (xdrproc_t)xdr_yppasswd, &yppasswd, (xdrproc_t)xdr_int, &ok, tv);
 
        if (ans != 0)
        {
@@ -191,7 +194,7 @@ pwskip(register char *p)
        return (p);
 }
 
-struct passwd *
+static struct passwd *
 interpret(struct passwd *pwent, char *line)
 {
        register char   *p = line;
@@ -240,7 +243,7 @@ ypgetpwnam(char *nam, char *domain)
        int reason, vallen;
        static char *__yplin = NULL;
 
-       reason = yp_match(domain, "passwd.byname", nam, strlen(nam),
+       reason = yp_match(domain, "passwd.byname", nam, (int)strlen(nam),
            &val, &vallen);
        switch(reason) {
        case 0:
@@ -258,3 +261,5 @@ ypgetpwnam(char *nam, char *domain)
 
        return(interpret(&pwent, __yplin));
 }
+
+#endif /* INFO_NIS */