system_cmds-498.2.tar.gz

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

diff --git a/passwd.tproj/passwd.c b/passwd.tproj/passwd.c
index 4b16ce78af7959bc81d9ce2aab8dd3a4fcfae991..2f8599aea2947e74016751f78c59380f1e856d4d 100644 (file)
--- a/passwd.tproj/passwd.c
+++ b/passwd.tproj/passwd.c
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @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
  * 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


@@ -22,9 +20,14 @@
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

-#define INFO_NETINFO 0
+#include <TargetConditionals.h>
+

 #define INFO_FILE 1
 #define INFO_FILE 1

+#if !TARGET_OS_EMBEDDED

 #define INFO_NIS 2
 #define INFO_NIS 2

+#define INFO_OPEN_DIRECTORY 3
+#define INFO_PAM 4
+#endif

 
 #ifndef __SLICK__
 #define _PASSWD_FILE "/etc/master.passwd"
 
 #ifndef __SLICK__
 #define _PASSWD_FILE "/etc/master.passwd"


@@ -38,18 +41,24 @@
 #include <libc.h>
 #include <ctype.h>
 #include <string.h>
 #include <libc.h>
 #include <ctype.h>
 #include <string.h>

-#include <netinfo/ni.h>

 #include "stringops.h"
 
 #ifdef __SLICK__
 #define _PASSWORD_LEN 8
 #endif
 
 #include "stringops.h"
 
 #ifdef __SLICK__
 #define _PASSWORD_LEN 8
 #endif
 

+char* progname = "passwd";
+

 static char *saltchars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
 
 extern int file_passwd(char *, char *);
 static char *saltchars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
 
 extern int file_passwd(char *, char *);

-extern int netinfo_passwd(char *, char *);

 extern int nis_passwd(char *, char *);
 extern int nis_passwd(char *, char *);

+#ifdef INFO_OPEN_DIRECTORY
+extern int od_passwd(char *, char *, char*);
+#endif
+#ifdef INFO_PAM
+extern int pam_passwd(char *);
+#endif

 
 void
 getpasswd(char *name, int isroot, int minlen, int mixcase, int nonalpha,
 
 void
 getpasswd(char *name, int isroot, int minlen, int mixcase, int nonalpha,


@@ -78,8 +87,9 @@ getpasswd(char *name, int isroot, int minlen, int mixcase, int nonalpha,
                        exit(1);
                }
        }
                        exit(1);
                }
        }

-       strcpy(obuf, p);
-
+       //strcpy(obuf, p);
+       snprintf( obuf, sizeof(obuf), "%s", p );
+       

        tries = 0;
        nbuf[0] = '\0';
        for (;;)
        tries = 0;
        nbuf[0] = '\0';
        for (;;)


@@ -132,7 +142,9 @@ getpasswd(char *name, int isroot, int minlen, int mixcase, int nonalpha,
                        continue;
                }
 
                        continue;
                }
 

-               strcpy(nbuf, p);
+               //strcpy(nbuf, p);
+               snprintf( nbuf, sizeof(nbuf), "%s", p );
+               

                if (!strcmp(nbuf, getpass("Retype new password:"))) break;
 
                printf("Mismatch; try again, EOF to quit.\n");
                if (!strcmp(nbuf, getpass("Retype new password:"))) break;
 
                printf("Mismatch; try again, EOF to quit.\n");


@@ -155,73 +167,113 @@ getpasswd(char *name, int isroot, int minlen, int mixcase, int nonalpha,
 void
 usage()
 {
 void
 usage()
 {

-       fprintf(stderr, "usage: passwd [-i infosystem] [-l location] [name]\n");
-       fprintf(stderr, "supported infosystems are:\n");
-       fprintf(stderr, "    netinfo\n");
+       fprintf(stderr, "usage: %s [-i infosystem] -l location]] [-u authname] [name]\n", progname);
+       fprintf(stderr, "  infosystem:\n");

        fprintf(stderr, "    file\n");
        fprintf(stderr, "    file\n");

-       fprintf(stderr, "    nis\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");
+       fprintf(stderr, "    NIS\n");
+       fprintf(stderr, "    OpenDirectory\n");
+       fprintf(stderr, "    PAM\n");
+       fprintf(stderr, "  location (for infosystem):\n");
+       fprintf(stderr, "    file           location is path to file (default is %s)\n", _PASSWD_FILE);
+       fprintf(stderr, "    NIS            location is NIS domain name\n");
+       fprintf(stderr, "    OpenDirectory  location is directory node name\n");
+       fprintf(stderr, "    PAM            location is not used\n");

        exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {
        exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {

-       char *user, *locn;
-       int i, infosystem;
-
-       infosystem = INFO_NETINFO;
-       user = NULL;
-       locn = NULL;
+       char* user = NULL;
+       char* locn = NULL;
+       char* auth = NULL;
+       int infosystem, ch;
+       int free_user = 0;
+       
+#ifdef INFO_PAM
+       infosystem = INFO_PAM;
+#else
+#ifdef INFO_OPEN_DIRECTORY
+       infosystem = INFO_OPEN_DIRECTORY;
+#else
+       infosystem = INFO_FILE;
+#endif
+#endif

 
 

-       for (i = 1; i < argc; i++)
-       {
-               if (!strcmp(argv[i], "-i"))
-               {
-                       if (++i >= argc)
-                       {
-                               fprintf(stderr, "no argument for -i option\n");
-                               usage();
-                       }
+#ifdef INFO_OPEN_DIRECTORY
+       /* PAM is the default infosystem, but we still want to use OpenDirectory directly when run by root */
+       if (0 == getuid())
+               infosystem = INFO_OPEN_DIRECTORY;
+#endif

 
 

-                       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;
-                       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;
-                       else if (!strcmp(argv[i], "YP")) infosystem = INFO_NIS;
-                       else if (!strcmp(argv[i], "yp")) infosystem = INFO_NIS;
-                       else
-                       {
-                               fprintf(stderr, "unknown info system \"%s\"\n", argv[i]);
+       while ((ch = getopt(argc, argv, "i:l:u:")) != -1)
+               switch(ch) {
+               case 'i':
+                       if (!strcasecmp(optarg, "file")) {
+                               infosystem = INFO_FILE;
+#ifdef INFO_NIS
+                       } else if (!strcasecmp(optarg, "NIS")) {
+                               infosystem = INFO_NIS;
+                       } else if (!strcasecmp(optarg, "YP")) {
+                               infosystem = INFO_NIS;
+#endif
+#ifdef INFO_OPEN_DIRECTORY
+                       } else if (!strcasecmp(optarg, "opendirectory")) {
+                               infosystem = INFO_OPEN_DIRECTORY;
+#endif
+#ifdef INFO_PAM
+                       } else if (!strcasecmp(optarg, "PAM")) {
+                               infosystem = INFO_PAM;
+#endif
+                       } else {
+                               fprintf(stderr, "%s: Unknown info system \'%s\'.\n",
+                                       progname, optarg);

                                usage();
                        }
                                usage();
                        }

-               }
+                       break;
+               case 'l':
+                       locn = optarg;
+                       break;
+               case 'u':
+                       auth = optarg;
+                       break;
+               case '?':
+               default:
+                       usage();
+                       break;
+       }
+       argc -= optind;
+       argv += optind;

 
 

-               else if (!strcmp(argv[i], "-l"))
-               {
-                       if (++i >= argc)
-                       {
-                               fprintf(stderr, "no argument for -l option\n");
-                               usage();
-                       }
-                       locn = argv[i];
-               }
-               else if (user == NULL) user = argv[i];
-               else usage();
+       if (argc > 1) {
+               usage();
+       } else if (argc == 1) {
+               user = argv[0];

        }
 
        }
 

+#ifdef INFO_PAM
+       if (INFO_PAM == infosystem && NULL != locn)
+               usage();
+#endif
+

        if (user == NULL)
        {
        if (user == NULL)
        {

-               /*
+               /*

                 * Verify that the login name exists.
                 * lukeh 24 Dec 1997
                 */
                 * Verify that the login name exists.
                 * lukeh 24 Dec 1997
                 */

-               if ((user = getlogin()) == NULL)
+                
+               /* getlogin() is the wrong thing to use here because it returns the wrong user after su */
+               /* sns 5 Jan 2005 */
+               
+               struct passwd * userRec = getpwuid(getuid());
+               if (userRec != NULL && userRec->pw_name != NULL) {
+                       /* global static mem is volatile; must strdup */
+                       user = strdup(userRec->pw_name);
+                       free_user = 1;
+               }
+               
+               if (user == NULL)

                {
                        fprintf(stderr, "you don't have a login name\n");
                        exit(1);
                {
                        fprintf(stderr, "you don't have a login name\n");
                        exit(1);


@@ -230,17 +282,29 @@ main(int argc, char *argv[])
        
        switch (infosystem)
        {
        
        switch (infosystem)
        {

-               case INFO_NETINFO:
-                       netinfo_passwd(user, locn);
-                       break;

                case INFO_FILE:
                        file_passwd(user, locn);
                        break;
                case INFO_FILE:
                        file_passwd(user, locn);
                        break;

+#ifdef INFO_NIS

                case INFO_NIS:
                        nis_passwd(user, locn);
                        break;
                case INFO_NIS:
                        nis_passwd(user, locn);
                        break;

+#endif
+#ifdef INFO_OPEN_DIRECTORY
+               case INFO_OPEN_DIRECTORY:
+                       od_passwd(user, locn, auth);
+                       break;
+#endif
+#ifdef INFO_PAM
+               case INFO_PAM:
+                       pam_passwd(user);
+                       break;
+#endif

        }
        }

-
+       
+       if (free_user == 1)
+               free(user);
+       

        exit(0);
 }
 
        exit(0);
 }