trying to get HEAD building again. If you want the code
[gd/samba-autobuild/.git] / source3 / utils / smbpasswd.c
index 00a7d3c1c1f46af53dec53de836b16152d793369..eade5331af658f5d5ddb7333b56a2d0e7c011262 100644 (file)
@@ -1,11 +1,12 @@
 /*
- * Unix SMB/Netbios implementation. Version 1.9. smbpasswd module. Copyright
- * (C) Jeremy Allison 1995-1998
+ * Unix SMB/CIFS implementation. 
+ * Copyright (C) Jeremy Allison 1995-1998
+ * Copyright (C) Tim Potter     2001
  * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * 
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc., 675
- * Mass Ave, Cambridge, MA 02139, USA.
- */
+ * Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
 
-extern pstring global_myname;
-extern int DEBUGLEVEL;
+extern BOOL AllowDebugChange;
 
 /*
  * Next two lines needed for SunOS and don't
@@ -29,17 +28,27 @@ extern int DEBUGLEVEL;
 extern char *optarg;
 extern int optind;
 
-/*********************************************************
-a strdup with exit
-**********************************************************/
-static char *xstrdup(char *s)
+/* forced running in root-mode */
+static BOOL got_pass = False, got_username = False;
+static BOOL stdin_passwd_get = False;
+static fstring user_name, user_password;
+static char *new_passwd = NULL;
+static const char *remote_machine = NULL;
+
+static fstring ldap_secret;
+
+/*****************************************************************************
+ stubb functions
+****************************************************************************/
+
+void become_root( void )
 {
-       s = strdup(s);
-       if (!s) {
-               fprintf(stderr,"out of memory\n");
-               exit(1);
-       }
-       return s;
+        return;
+}
+
+void unbecome_root( void )
+{
+        return;
 }
 
 
@@ -48,94 +57,172 @@ static char *xstrdup(char *s)
 **********************************************************/
 static void usage(void)
 {
-       if (getuid() == 0) {
-               printf("smbpasswd [options] [username] [password]\n");
-       } else {
-               printf("smbpasswd [options] [password]\n");
-       }
+       printf("When run by root:\n");
+       printf("    smbpasswd [options] [username] [password]\n");
+       printf("otherwise:\n");
+       printf("    smbpasswd [options] [password]\n\n");
+
        printf("options:\n");
+       printf("  -L                   local mode (must be first option)\n");
+       printf("  -h                   print this usage message\n");
        printf("  -s                   use stdin for password prompt\n");
+       printf("  -c smb.conf file     Use the given path to the smb.conf file\n");
        printf("  -D LEVEL             debug level\n");
-       printf("  -U USER              remote username\n");
        printf("  -r MACHINE           remote machine\n");
+       printf("  -U USER              remote username\n");
+
+       printf("extra options when run by root or in local mode:\n");
+       printf("  -a                   add user\n");
+       printf("  -d                   disable user\n");
+       printf("  -e                   enable user\n");
+       printf("  -i                   interdomain trust account\n");
+       printf("  -m                   machine trust account\n");
+       printf("  -n                   set no password\n");
+       printf("  -w                   ldap admin password\n");
+       printf("  -x                   delete user\n");
+       printf("  -R ORDER             name resolve order\n");
 
-       if (getuid() == 0) {
-               printf("  -R ORDER             name resolve order\n");
-               printf("  -j DOMAIN            join domain name\n");
-               printf("  -a                   add user\n");
-               printf("  -x                   delete user\n");
-               printf("  -d                   disable user\n");
-               printf("  -e                   enable user\n");
-               printf("  -n                   set no password\n");
-               printf("  -m                   machine trust account\n");
-       }
        exit(1);
 }
 
-/*********************************************************
-Join a domain.
-**********************************************************/
-static int join_domain(char *domain, char *remote)
+static void set_line_buffering(FILE *f)
 {
-       pstring remote_machine;
-       fstring trust_passwd;
-       unsigned char orig_trust_passwd_hash[16];
-       BOOL ret;
+       setvbuf(f, NULL, _IOLBF, 0);
+}
 
-       pstrcpy(remote_machine, remote ? remote : "");
-       fstrcpy(trust_passwd, global_myname);
-       strlower(trust_passwd);
-       E_md4hash( (uchar *)trust_passwd, orig_trust_passwd_hash);
+/*******************************************************************
+ Process command line options
+ ******************************************************************/
+static int process_options(int argc, char **argv, int local_flags)
+{
+       int ch;
+       pstring configfile;
+       pstrcpy(configfile, dyn_CONFIGFILE);
 
-       /* Ensure that we are not trying to join a
-          domain if we are locally set up as a domain
-          controller. */
+       local_flags |= LOCAL_SET_PASSWORD;
 
-       if(strequal(remote, global_myname)) {
-               fprintf(stderr, "Cannot join domain %s as the domain controller name is our own. We cannot be a domain controller for a domain and also be a domain member.\n", domain);
-               return 1;
-       }
+       ZERO_STRUCT(user_name);
+       ZERO_STRUCT(user_password);
 
-       /*
-        * Write the old machine account password.
-        */
-       
-       if(!secrets_store_trust_account_password(domain,  orig_trust_passwd_hash)) {              
-               fprintf(stderr, "Unable to write the machine account password for \
-machine %s in domain %s.\n", global_myname, domain);
-               return 1;
+       user_name[0] = '\0';
+
+       while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:L")) != EOF) {
+               switch(ch) {
+               case 'L':
+                       local_flags |= LOCAL_AM_ROOT;
+                       break;
+               case 'c':
+                       pstrcpy(configfile,optarg);
+                       break;
+               case 'a':
+                       local_flags |= LOCAL_ADD_USER;
+                       break;
+               case 'x':
+                       local_flags |= LOCAL_DELETE_USER;
+                       local_flags &= ~LOCAL_SET_PASSWORD;
+                       break;
+               case 'd':
+                       local_flags |= LOCAL_DISABLE_USER;
+                       local_flags &= ~LOCAL_SET_PASSWORD;
+                       break;
+               case 'e':
+                       local_flags |= LOCAL_ENABLE_USER;
+                       local_flags &= ~LOCAL_SET_PASSWORD;
+                       break;
+               case 'm':
+                       local_flags |= LOCAL_TRUST_ACCOUNT;
+                       break;
+               case 'i':
+                       local_flags |= LOCAL_INTERDOM_ACCOUNT;
+                       break;
+               case 'j':
+                       d_printf("See 'net join' for this functionality\n");
+                       exit(1);
+                       break;
+               case 'n':
+                       local_flags |= LOCAL_SET_NO_PASSWORD;
+                       local_flags &= ~LOCAL_SET_PASSWORD;
+                       new_passwd = smb_xstrdup("NO PASSWORD");
+                       break;
+               case 'r':
+                       remote_machine = optarg;
+                       break;
+               case 's':
+                       set_line_buffering(stdin);
+                       set_line_buffering(stdout);
+                       set_line_buffering(stderr);
+                       stdin_passwd_get = True;
+                       break;
+               case 'w':
+                       local_flags |= LOCAL_SET_LDAP_ADMIN_PW;
+                       fstrcpy(ldap_secret, optarg);
+                       break;
+               case 'R':
+                       lp_set_name_resolve_order(optarg);
+                       break;
+               case 'D':
+                       DEBUGLEVEL = atoi(optarg);
+                       break;
+               case 'U': {
+                       char *lp;
+
+                       got_username = True;
+                       fstrcpy(user_name, optarg);
+
+                       if ((lp = strchr(user_name, '%'))) {
+                               *lp = 0;
+                               fstrcpy(user_password, lp + 1);
+                               got_pass = True;
+                               memset(strchr_m(optarg, '%') + 1, 'X',
+                                      strlen(user_password));
+                       }
+
+                       break;
+               }
+               case 'h':
+               default:
+                       usage();
+               }
        }
        
-       /*
-        * If we are given a remote machine assume this is the PDC.
-        */
-       
-       if(remote == NULL) {
-               pstrcpy(remote_machine, lp_passwordserver());
-       }
+       argc -= optind;
+       argv += optind;
 
-       if(!*remote_machine) {
-               fprintf(stderr, "No password server list given in smb.conf - \
-unable to join domain.\n");
-               return 1;
-       }
+       switch(argc) {
+       case 0:
+               if (!got_username)
+                       fstrcpy(user_name, "");
+               break;
+       case 1:
+               if (!(local_flags & LOCAL_AM_ROOT)) {
+                       new_passwd = argv[0];
+               } else {
+                       if (got_username) {
+                               usage();
+                       } else {
+                               fstrcpy(user_name, argv[0]);
+                       }
+               }
+               break;
+       case 2:
+               if (!(local_flags & LOCAL_AM_ROOT) || got_username || got_pass) {
+                       usage();
+               }
 
-       ret = change_trust_account_password( domain, remote_machine);
-       
-       if(!ret) {
-               trust_password_delete(domain);
-               fprintf(stderr,"Unable to join domain %s.\n",domain);
-       } else {
-               printf("Joined domain %s.\n",domain);
+               fstrcpy(user_name, argv[0]);
+               new_passwd = smb_xstrdup(argv[1]);
+               break;
+       default:
+               usage();
        }
-       
-       return (int)ret;
-}
 
+       if (!lp_load(configfile,True,False,False)) {
+               fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
+                       dyn_CONFIGFILE);
+               exit(1);
+       }
 
-static void set_line_buffering(FILE *f)
-{
-       setvbuf(f, NULL, _IOLBF, 0);
+       return local_flags;
 }
 
 /*************************************************************
@@ -144,23 +231,23 @@ static void set_line_buffering(FILE *f)
 *************************************************************/
 static char *stdin_new_passwd(void)
 {
-       static fstring new_passwd;
+       static fstring new_pw;
        size_t len;
 
-       ZERO_ARRAY(new_passwd);
+       ZERO_ARRAY(new_pw);
 
        /*
         * if no error is reported from fgets() and string at least contains
         * the newline that ends the password, then replace the newline with
         * a null terminator.
         */
-       if ( fgets(new_passwd, sizeof(new_passwd), stdin) != NULL) {
-               if ((len = strlen(new_passwd)) > 0) {
-                       if(new_passwd[len-1] == '\n')
-                               new_passwd[len - 1] = 0; 
+       if ( fgets(new_pw, sizeof(new_pw), stdin) != NULL) {
+               if ((len = strlen(new_pw)) > 0) {
+                       if(new_pw[len-1] == '\n')
+                               new_pw[len - 1] = 0; 
                }
        }
-       return(new_passwd);
+       return(new_pw);
 }
 
 
@@ -169,7 +256,7 @@ static char *stdin_new_passwd(void)
  Used if the '-s' option is set to silently get passwords
  to enable scripting.
 *************************************************************/
-static char *get_pass( char *prompt, BOOL stdin_get)
+static char *get_pass( const char *prompt, BOOL stdin_get)
 {
        char *p;
        if (stdin_get) {
@@ -177,7 +264,7 @@ static char *get_pass( char *prompt, BOOL stdin_get)
        } else {
                p = getpass(prompt);
        }
-       return xstrdup(p);
+       return smb_xstrdup(p);
 }
 
 /*************************************************************
@@ -186,21 +273,21 @@ static char *get_pass( char *prompt, BOOL stdin_get)
 static char *prompt_for_new_password(BOOL stdin_get)
 {
        char *p;
-       fstring new_passwd;
+       fstring new_pw;
 
-       ZERO_ARRAY(new_passwd);
+       ZERO_ARRAY(new_pw);
  
        p = get_pass("New SMB password:", stdin_get);
 
-       fstrcpy(new_passwd, p);
-       safe_free(p);
+       fstrcpy(new_pw, p);
+       SAFE_FREE(p);
 
        p = get_pass("Retype new SMB password:", stdin_get);
 
-       if (strcmp(p, new_passwd)) {
+       if (strcmp(p, new_pw)) {
                fprintf(stderr, "Mismatch - password unchanged.\n");
-               ZERO_ARRAY(new_passwd);
-               safe_free(p);
+               ZERO_ARRAY(new_pw);
+               SAFE_FREE(p);
                return NULL;
        }
 
@@ -212,27 +299,27 @@ static char *prompt_for_new_password(BOOL stdin_get)
  Change a password either locally or remotely.
 *************************************************************/
 
-static BOOL password_change(const char *remote_machine, char *user_name, 
-                           char *old_passwd, char *new_passwd, int local_flags)
+static BOOL password_change(const char *remote_mach, char *username, 
+                           char *old_passwd, char *new_pw, int local_flags)
 {
        BOOL ret;
        pstring err_str;
        pstring msg_str;
 
-       if (remote_machine != NULL) {
+       if (remote_mach != NULL) {
                if (local_flags & (LOCAL_ADD_USER|LOCAL_DELETE_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|
                                                        LOCAL_TRUST_ACCOUNT|LOCAL_SET_NO_PASSWORD)) {
                        /* these things can't be done remotely yet */
                        return False;
                }
-               ret = remote_password_change(remote_machine, user_name, 
-                                                                        old_passwd, new_passwd, err_str, sizeof(err_str));
+               ret = remote_password_change(remote_mach, username, 
+                                            old_passwd, new_pw, err_str, sizeof(err_str));
                if(*err_str)
                        fprintf(stderr, err_str);
                return ret;
        }
        
-       ret = local_password_change(user_name, local_flags, new_passwd
+       ret = local_password_change(username, local_flags, new_pw
                                     err_str, sizeof(err_str), msg_str, sizeof(msg_str));
 
        if(*msg_str)
@@ -243,80 +330,39 @@ static BOOL password_change(const char *remote_machine, char *user_name,
        return ret;
 }
 
+/*******************************************************************
+ Store the LDAP admin password in secrets.tdb
+ ******************************************************************/
+static BOOL store_ldap_admin_pw (char* pw)
+{      
+       if (!pw) 
+               return False;
+
+       if (!secrets_init())
+               return False;
+       
+       return secrets_store_ldap_pw(lp_ldap_admin_dn(), pw);
+}
+
 
 /*************************************************************
  Handle password changing for root.
 *************************************************************/
 
-static int process_root(int argc, char *argv[])
+static int process_root(int local_flags)
 {
        struct passwd  *pwd;
-       int result = 0, ch;
-       BOOL joining_domain = False;
-       int local_flags = 0;
-       BOOL stdin_passwd_get = False;
-       char *user_name = NULL;
-       char *new_domain = NULL;
-       char *new_passwd = NULL;
+       int result = 0;
        char *old_passwd = NULL;
-       char *remote_machine = NULL;
 
-       while ((ch = getopt(argc, argv, "ax:d:e:mnj:r:sR:D:U:")) != EOF) {
-               switch(ch) {
-               case 'a':
-                       local_flags |= LOCAL_ADD_USER;
-                       break;
-               case 'x':
-                       local_flags |= LOCAL_DELETE_USER;
-                       user_name = optarg;
-                       new_passwd = xstrdup("XXXXXX");
-                       break;
-               case 'd':
-                       local_flags |= LOCAL_DISABLE_USER;
-                       user_name = optarg;
-                       new_passwd = xstrdup("XXXXXX");
-                       break;
-               case 'e':
-                       local_flags |= LOCAL_ENABLE_USER;
-                       user_name = optarg;
-                       break;
-               case 'm':
-                       local_flags |= LOCAL_TRUST_ACCOUNT;
-                       break;
-               case 'n':
-                       local_flags |= LOCAL_SET_NO_PASSWORD;
-                       new_passwd = xstrdup("NO PASSWORD");
-                       break;
-               case 'j':
-                       new_domain = optarg;
-                       strupper(new_domain);
-                       joining_domain = True;
-                       break;
-               case 'r':
-                       remote_machine = optarg;
-                       break;
-               case 's':
-                       set_line_buffering(stdin);
-                       set_line_buffering(stdout);
-                       set_line_buffering(stderr);
-                       stdin_passwd_get = True;
-                       break;
-               case 'R':
-                       lp_set_name_resolve_order(optarg);
-                       break;
-               case 'D':
-                       DEBUGLEVEL = atoi(optarg);
-                       break;
-               case 'U':
-                       user_name = optarg;
-                       break;
-               default:
-                       usage();
-               }
+       if (local_flags & LOCAL_SET_LDAP_ADMIN_PW)
+       {
+               printf("Setting stored password for \"%s\" in secrets.tdb\n", 
+                       lp_ldap_admin_dn());
+               if (!store_ldap_admin_pw(ldap_secret))
+                       DEBUG(0,("ERROR: Failed to store the ldap admin password!\n"));
+               goto done;
        }
-       
-       argc -= optind;
-       argv += optind;
 
        /*
         * Ensure both add/delete user are not set
@@ -325,45 +371,22 @@ static int process_root(int argc, char *argv[])
         */     
        if(((local_flags & (LOCAL_ADD_USER|LOCAL_DELETE_USER)) == (LOCAL_ADD_USER|LOCAL_DELETE_USER)) || 
           ((local_flags & (LOCAL_ADD_USER|LOCAL_DELETE_USER)) && 
-               ((remote_machine != NULL) || joining_domain))) {
+               (remote_machine != NULL))) {
                usage();
        }
        
        /* Only load interfaces if we are doing network operations. */
 
-       if (joining_domain || remote_machine) {
+       if (remote_machine) {
                load_interfaces();
        }
 
-       if(joining_domain) {
-               if (argc != 0)
-                       usage();
-               return join_domain(new_domain, remote_machine);
-       }
-
-       /*
-        * Deal with root - can add a user, but only locally.
-        */
-
-       switch(argc) {
-       case 0:
-               break;
-       case 1:
-               user_name = argv[0];
-               break;
-       case 2:
-               user_name = argv[0];
-               new_passwd = xstrdup(argv[1]);
-               break;
-       default:
-               usage();
-       }
-
-       if (!user_name && (pwd = sys_getpwuid(0))) {
-               user_name = xstrdup(pwd->pw_name);
+       if (!user_name[0] && (pwd = getpwuid_alloc(geteuid()))) {
+               fstrcpy(user_name, pwd->pw_name);
+               passwd_free(&pwd);
        } 
 
-       if (!user_name) {
+       if (!user_name[0]) {
                fprintf(stderr,"You must specify a username\n");
                exit(1);
        }
@@ -382,9 +405,9 @@ static int process_root(int argc, char *argv[])
                }
 
                if (local_flags & LOCAL_ADD_USER) {
-                       safe_free(new_passwd);
-                       new_passwd = xstrdup(user_name);
-                       strlower(new_passwd);
+                       SAFE_FREE(new_passwd);
+                       new_passwd = smb_xstrdup(user_name);
+                       strlower_m(new_passwd);
                }
 
                /*
@@ -393,52 +416,74 @@ static int process_root(int argc, char *argv[])
                 */
 
                slprintf(buf, sizeof(buf)-1, "%s$", user_name);
-               user_name = buf;
-       }
-
-       if (remote_machine != NULL) {
-               old_passwd = get_pass("Old SMB password:",stdin_passwd_get);
-       }
-       
-       if (!new_passwd) {
-
-               /*
-                * If we are trying to enable a user, first we need to find out
-                * if they are using a modern version of the smbpasswd file that
-                * disables a user by just writing a flag into the file. If so
-                * then we can re-enable a user without prompting for a new
-                * password. If not (ie. they have a no stored password in the
-                * smbpasswd file) then we need to prompt for a new password.
-                */
+               fstrcpy(user_name, buf);
+       } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
+               static fstring buf;
 
-               if(local_flags & LOCAL_ENABLE_USER) {
-                       SAM_ACCOUNT *sampass = NULL;
-                       BOOL ret;
+               if ((local_flags & LOCAL_ADD_USER) && (new_passwd == NULL)) {
+                       /*
+                        * Prompt for trusting domain's account password
+                        */
+                       new_passwd = prompt_for_new_password(stdin_passwd_get);
+                       if(!new_passwd) {
+                               fprintf(stderr, "Unable to get newpassword.\n");
+                               exit(1);
+                       }
+               }
+               
+               /* prepare uppercased and '$' terminated username */
+               slprintf(buf, sizeof(buf) - 1, "%s$", user_name);
+               fstrcpy(user_name, buf);
+               
+       } else {
+               
+               if (remote_machine != NULL) {
+                       old_passwd = get_pass("Old SMB password:",stdin_passwd_get);
+               }
+               
+               if (!(local_flags & LOCAL_SET_PASSWORD)) {
+                       
+                       /*
+                        * If we are trying to enable a user, first we need to find out
+                        * if they are using a modern version of the smbpasswd file that
+                        * disables a user by just writing a flag into the file. If so
+                        * then we can re-enable a user without prompting for a new
+                        * password. If not (ie. they have a no stored password in the
+                        * smbpasswd file) then we need to prompt for a new password.
+                        */
                        
-                       pdb_init_sam(&sampass);
-                       ret = pdb_getsampwnam(sampass, user_name);
-                       if((sampass != False) && (pdb_get_lanman_passwd(sampass) != NULL)) {
-                               new_passwd = xstrdup("XXXX"); /* Don't care. */
+                       if(local_flags & LOCAL_ENABLE_USER) {
+                               SAM_ACCOUNT *sampass = NULL;
+                               BOOL ret;
+                               
+                               pdb_init_sam(&sampass);
+                               ret = pdb_getsampwnam(sampass, user_name);
+                               if((sampass != False) && (pdb_get_lanman_passwd(sampass) == NULL)) {
+                                       local_flags |= LOCAL_SET_PASSWORD;
+                               }
+                               pdb_free_sam(&sampass);
                        }
-                       pdb_free_sam(sampass);
                }
-
-               if(!new_passwd)
+               
+               if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) {
                        new_passwd = prompt_for_new_password(stdin_passwd_get);
-
-               if(!new_passwd) {
-                       fprintf(stderr, "Unable to get new password.\n");
-                       exit(1);
+                       
+                       if(!new_passwd) {
+                               fprintf(stderr, "Unable to get new password.\n");
+                               exit(1);
+                       }
                }
        }
-       
+
        if (!password_change(remote_machine, user_name, old_passwd, new_passwd, local_flags)) {
                fprintf(stderr,"Failed to modify password entry for user %s\n", user_name);
                result = 1;
                goto done;
        } 
 
-       if(!(local_flags & (LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|LOCAL_DELETE_USER|LOCAL_SET_NO_PASSWORD))) {
+       if(remote_machine) {
+               printf("Password changed for user %s on %s.\n", user_name, remote_machine );
+       } else if(!(local_flags & (LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|LOCAL_DELETE_USER|LOCAL_SET_NO_PASSWORD|LOCAL_SET_PASSWORD))) {
                SAM_ACCOUNT *sampass = NULL;
                BOOL ret;
                
@@ -451,67 +496,38 @@ static int process_root(int argc, char *argv[])
                if((ret != False) && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) )
                        printf(" User has no password flag set.");
                printf("\n");
-               pdb_free_sam(sampass);
+               pdb_free_sam(&sampass);
        }
 
  done:
-       safe_free(new_passwd);
+       SAFE_FREE(new_passwd);
        return result;
 }
 
 
 /*************************************************************
-handle password changing for non-root
+ Handle password changing for non-root.
 *************************************************************/
-static int process_nonroot(int argc, char *argv[])
+
+static int process_nonroot(int local_flags)
 {
        struct passwd  *pwd = NULL;
-       int result = 0, ch;
-       BOOL stdin_passwd_get = False;
-       char *old_passwd = NULL;
-       char *remote_machine = NULL;
-       char *user_name = NULL;
-       char *new_passwd = NULL;
-
-       while ((ch = getopt(argc, argv, "hD:r:sU:")) != EOF) {
-               switch(ch) {
-               case 'D':
-                       DEBUGLEVEL = atoi(optarg);
-                       break;
-               case 'r':
-                       remote_machine = optarg;
-                       break;
-               case 's':
-                       set_line_buffering(stdin);
-                       set_line_buffering(stdout);
-                       set_line_buffering(stderr);
-                       stdin_passwd_get = True;
-                       break;
-               case 'U':
-                       user_name = optarg;
-                       break;
-               default:
-                       usage();
-               }
-       }
-       
-       argc -= optind;
-       argv += optind;
+       int result = 0;
+       char *old_pw = NULL;
+       char *new_pw = NULL;
 
-       if(argc > 1) {
+       if (local_flags & ~(LOCAL_AM_ROOT | LOCAL_SET_PASSWORD)) {
+               /* Extra flags that we can't honor non-root */
                usage();
        }
-       
-       if (argc == 1) {
-               new_passwd = argv[0];
-       }
-       
-       if (!user_name) {
-               pwd = sys_getpwuid(getuid());
+
+       if (!user_name[0]) {
+               pwd = getpwuid_alloc(getuid());
                if (pwd) {
-                       user_name = xstrdup(pwd->pw_name);
+                       fstrcpy(user_name,pwd->pw_name);
+                       passwd_free(&pwd);
                } else {
-                       fprintf(stderr,"you don't exist - go away\n");
+                       fprintf(stderr, "smbpasswd: you don't exist - go away\n");
                        exit(1);
                }
        }
@@ -529,19 +545,21 @@ static int process_nonroot(int argc, char *argv[])
        }
 
        if (remote_machine != NULL) {
-               old_passwd = get_pass("Old SMB password:",stdin_passwd_get);
+               old_pw = get_pass("Old SMB password:",stdin_passwd_get);
        }
        
        if (!new_passwd) {
-               new_passwd = prompt_for_new_password(stdin_passwd_get);
+               new_pw = prompt_for_new_password(stdin_passwd_get);
        }
+       else
+               new_pw = smb_xstrdup(new_passwd);
        
-       if (!new_passwd) {
+       if (!new_pw) {
                fprintf(stderr, "Unable to get new password.\n");
                exit(1);
        }
 
-       if (!password_change(remote_machine, user_name, old_passwd, new_passwd, 0)) {
+       if (!password_change(remote_machine, user_name, old_pw, new_pw, 0)) {
                fprintf(stderr,"Failed to change password for %s\n", user_name);
                result = 1;
                goto done;
@@ -550,8 +568,8 @@ static int process_nonroot(int argc, char *argv[])
        printf("Password changed for user %s\n", user_name);
 
  done:
-       safe_free(old_passwd);
-       safe_free(new_passwd);
+       SAFE_FREE(old_pw);
+       SAFE_FREE(new_pw);
 
        return result;
 }
@@ -563,55 +581,40 @@ static int process_nonroot(int argc, char *argv[])
 **********************************************************/
 int main(int argc, char **argv)
 {      
-       static pstring servicesf = CONFIGFILE;
+       int local_flags = 0;
+       
+       AllowDebugChange = False;
 
 #if defined(HAVE_SET_AUTH_PARAMETERS)
        set_auth_parameters(argc, argv);
 #endif /* HAVE_SET_AUTH_PARAMETERS */
 
-       TimeInit();
-       
-       setup_logging("smbpasswd", True);
-       
-       charset_initialise();
-       
-       if(!initialize_password_db(True)) {
-               fprintf(stderr, "Can't setup password database vectors.\n");
-               exit(1);
+       if (getuid() == 0) {
+               local_flags = LOCAL_AM_ROOT;
        }
 
-       if (!lp_load(servicesf,True,False,False)) {
-               fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
-                       servicesf);
-               exit(1);
-       }
+       local_flags = process_options(argc, argv, local_flags);
 
+       setup_logging("smbpasswd", True);
+       
        /*
         * Set the machine NETBIOS name if not already
         * set from the config file. 
         */ 
     
-       if (!*global_myname) {   
-               char *p;
-               fstrcpy(global_myname, myhostname());
-               p = strchr(global_myname, '.' );
-               if (p) *p = 0;
-       }           
-       strupper(global_myname);
-
-       codepage_initialise(lp_client_code_page());
-
-       secrets_init();
+       if (!init_names())
+               return 1;
 
        /* Check the effective uid - make sure we are not setuid */
-       if ((geteuid() == (uid_t)0) && (getuid() != (uid_t)0)) {
+       if (is_setuid_root()) {
                fprintf(stderr, "smbpasswd must *NOT* be setuid root.\n");
                exit(1);
        }
 
-       if (getuid() == 0) {
-               return process_root(argc, argv);
+       if (local_flags & LOCAL_AM_ROOT) {
+               secrets_init();
+               return process_root(local_flags);
        } 
 
-       return process_nonroot(argc, argv);
+       return process_nonroot(local_flags);
 }