system_cmds-433.tar.gz

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

diff --git a/chkpasswd.tproj/passwd.c b/chkpasswd.tproj/passwd.c
index 6c201cb800e9905d8b7e887a0513195fbfcb23cb..ac50cd0dfa7e574e0ddda2cacd08b855d883f8be 100644 (file)
--- a/chkpasswd.tproj/passwd.c
+++ b/chkpasswd.tproj/passwd.c
@@ -3,26 +3,24 @@
  *
  * @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@
  */
-#define INFO_NETINFO 0
 #define INFO_FILE 1
 #define INFO_NIS 2
 #define INFO_DIRECTORYSERVICES 3
@@ -40,7 +38,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <pwd.h>
-#include <netinfo/ni.h>
 #include "stringops.h"
 
 #ifdef __SLICK__
@@ -50,7 +47,6 @@
 static int literal = 0;
 
 extern int file_check_passwd(char *, char *);
-extern int netinfo_check_passwd(char *, char *);
 extern int nis_check_passwd(char *, char *);
 extern int ds_check_passwd(char *, char *);
 
@@ -85,11 +81,9 @@ usage()
 {
        fprintf(stderr, "usage: chkpasswd [-i infosystem] [-l location] [-c] [name]\n");
        fprintf(stderr, "supported infosystems are:\n");
-       fprintf(stderr, "    netinfo\n");
        fprintf(stderr, "    file\n");
        fprintf(stderr, "    nis\n");
        fprintf(stderr, "    opendirectory\n");
-       fprintf(stderr, "for netinfo, location may be a domain name or server/tag\n");
        fprintf(stderr, "for file, location may be a file name (%s is the default)\n",
                _PASSWD_FILE);
        fprintf(stderr, "for nis, location may be a NIS domainname\n");
@@ -120,9 +114,7 @@ main(int argc, char *argv[])
                                usage();
                        }
 
-                       if (!strcmp(argv[i], "NetInfo")) infosystem = INFO_NETINFO;
-                       else if (!strcmp(argv[i], "netinfo")) infosystem = INFO_NETINFO;
-                       else if (!strcmp(argv[i], "File")) infosystem = INFO_FILE;
+                       if (!strcmp(argv[i], "File")) infosystem = INFO_FILE;
                        else if (!strcmp(argv[i], "file")) infosystem = INFO_FILE;
                        else if (!strcmp(argv[i], "NIS")) infosystem = INFO_NIS;
                        else if (!strcmp(argv[i], "nis")) infosystem = INFO_NIS;
@@ -162,9 +154,6 @@ main(int argc, char *argv[])
        
        switch (infosystem)
        {
-               case INFO_NETINFO:
-                       netinfo_check_passwd(user, locn);
-                       break;
                case INFO_FILE:
                        file_check_passwd(user, locn);
                        break;