s3-debug Remove 'AllowDebugChange' and use lp_set_cmdline() instead
[metze/samba/wip.git] / source3 / utils / smbpasswd.c
index de7e66a0842924edd6b2c3a2c80cd8030a3572b0..c530c78f41fffd76b8152109fa06359808a0af7d 100644 (file)
@@ -5,7 +5,7 @@
  * 
  * 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
+ * Free Software Foundation; either version 3 of the License, or (at your
  * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * more details.
  * 
  * 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.  */
+ * this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
-
-extern pstring global_myname;
-extern BOOL AllowDebugChange;
+#include "secrets.h"
+#include "../librpc/gen_ndr/samr.h"
 
 /*
  * Next two lines needed for SunOS and don't
@@ -29,38 +27,46 @@ extern BOOL AllowDebugChange;
 extern char *optarg;
 extern int optind;
 
-/** forced running in root-mode **/
-static BOOL local_mode;
+/* forced running in root-mode */
+static bool got_username = False;
+static bool stdin_passwd_get = False;
+static fstring user_name;
+static char *new_passwd = NULL;
+static const char *remote_machine = NULL;
+
+static fstring ldap_secret;
+
 
-/**
Print command usage on stderr and die.
- **/
+/*********************************************************
+ Print command usage on stderr and die.
+**********************************************************/
 static void usage(void)
 {
        printf("When run by root:\n");
-       printf("    smbpasswd [options] [username] [password]\n");
+       printf("    smbpasswd [options] [username]\n");
        printf("otherwise:\n");
-       printf("    smbpasswd [options] [password]\n\n");
+       printf("    smbpasswd [options]\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("  -L                   local mode (must be first option)\n");
-       printf("  -R ORDER             name resolve order\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");
        printf("  -i                   interdomain trust account\n");
-#ifdef WITH_LDAP_SAM
-       printf("  -w                   ldap admin password\n");
-#endif
+       printf("  -m                   machine trust account\n");
+       printf("  -n                   set no password\n");
+       printf("  -W                   use stdin ldap admin password\n");
+       printf("  -w PASSWORD          ldap admin password\n");
+       printf("  -x                   delete user\n");
+       printf("  -R ORDER             name resolve order\n");
 
        exit(1);
 }
@@ -70,155 +76,34 @@ static void set_line_buffering(FILE *f)
        setvbuf(f, NULL, _IOLBF, 0);
 }
 
-/*************************************************************
- Utility function to prompt for passwords from stdin. Each
- password entered must end with a newline.
-*************************************************************/
-static char *stdin_new_passwd(void)
-{
-       static fstring new_passwd;
-       size_t len;
-
-       ZERO_ARRAY(new_passwd);
-
-       /*
-        * 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; 
-               }
-       }
-       return(new_passwd);
-}
-
-
-/*************************************************************
- Utility function to get passwords via tty or stdin
- Used if the '-s' option is set to silently get passwords
- to enable scripting.
-*************************************************************/
-static char *get_pass( char *prompt, BOOL stdin_get)
-{
-       char *p;
-       if (stdin_get) {
-               p = stdin_new_passwd();
-       } else {
-               p = getpass(prompt);
-       }
-       return smb_xstrdup(p);
-}
-
-/*************************************************************
- Utility function to prompt for new password.
-*************************************************************/
-static char *prompt_for_new_password(BOOL stdin_get)
-{
-       char *p;
-       fstring new_passwd;
-
-       ZERO_ARRAY(new_passwd);
-       p = get_pass("New SMB password:", stdin_get);
-
-       fstrcpy(new_passwd, p);
-       SAFE_FREE(p);
-
-       p = get_pass("Retype new SMB password:", stdin_get);
-
-       if (strcmp(p, new_passwd)) {
-               fprintf(stderr, "Mismatch - password unchanged.\n");
-               ZERO_ARRAY(new_passwd);
-               SAFE_FREE(p);
-               return NULL;
-       }
-
-       return p;
-}
-
-
-/*************************************************************
- 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)
-{
-       BOOL ret;
-       pstring err_str;
-       pstring msg_str;
-
-       if (remote_machine != 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));
-               if(*err_str)
-                       fprintf(stderr, err_str);
-               return ret;
-       }
-       
-       ret = local_password_change(user_name, local_flags, new_passwd, 
-                                    err_str, sizeof(err_str), msg_str, sizeof(msg_str));
-
-       if(*msg_str)
-               printf(msg_str);
-       if(*err_str)
-               fprintf(stderr, err_str);
-
-       return ret;
-}
-
-#ifdef WITH_LDAP_SAM
 /*******************************************************************
- Store the LDAP admin password in secrets.tdb
+ Process command line options
  ******************************************************************/
-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);
-}
-#endif
 
-/*************************************************************
- Handle password changing for root.
-*************************************************************/
-
-static int process_root(int argc, char *argv[])
+static int process_options(int argc, char **argv, int local_flags)
 {
-       struct passwd  *pwd;
-       int result = 0, ch;
-       BOOL got_pass = False, got_username = False;
-       int local_flags = LOCAL_SET_PASSWORD;
-       BOOL stdin_passwd_get = False;
-       fstring user_name, user_password;
-       char *new_passwd = NULL;
-       char *old_passwd = NULL;
-       char *remote_machine = NULL;
-#ifdef WITH_LDAP_SAM
-       fstring ldap_secret;
-#endif
+       int ch;
+       const char *configfile = get_dyn_CONFIGFILE();
+
+       local_flags |= LOCAL_SET_PASSWORD;
 
        ZERO_STRUCT(user_name);
-       ZERO_STRUCT(user_password);
 
        user_name[0] = '\0';
 
-       while ((ch = getopt(argc, argv, "axdehmnijr:sw:R:D:U:L")) != EOF) {
+       while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:LW")) != EOF) {
                switch(ch) {
                case 'L':
-                       local_mode = True;
+#if !defined(NSS_WRAPPER)
+                       if (getuid() != 0) {
+                               fprintf(stderr, "smbpasswd -L can only be used by root.\n");
+                               exit(1);
+                       }
+#endif
+                       local_flags |= LOCAL_AM_ROOT;
+                       break;
+               case 'c':
+                       configfile = optarg;
                        break;
                case 'a':
                        local_flags |= LOCAL_ADD_USER;
@@ -242,9 +127,14 @@ static int process_root(int argc, char *argv[])
                        local_flags |= LOCAL_INTERDOM_ACCOUNT;
                        break;
                case 'j':
-                       d_printf("See 'net rpc join' for this functionality\n");
+                       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;
@@ -255,14 +145,9 @@ static int process_root(int argc, char *argv[])
                        stdin_passwd_get = True;
                        break;
                case 'w':
-#ifdef WITH_LDAP_SAM
                        local_flags |= LOCAL_SET_LDAP_ADMIN_PW;
                        fstrcpy(ldap_secret, optarg);
                        break;
-#else
-                       printf("-w not available unless configured --with-ldap\n");
-                       goto done;
-#endif                 
                case 'R':
                        lp_set_name_resolve_order(optarg);
                        break;
@@ -270,19 +155,12 @@ static int process_root(int argc, char *argv[])
                        DEBUGLEVEL = atoi(optarg);
                        break;
                case 'U': {
-                       char *lp;
-
                        got_username = True;
                        fstrcpy(user_name, optarg);
-
-                       if ((lp = strchr_m(user_name, '%'))) {
-                               *lp = 0;
-                               fstrcpy(user_password, lp + 1);
-                               got_pass = True;
-                               memset(strchr_m(optarg, '%') + 1, 'X',
-                                      strlen(user_password));
-                       }
-
+                       break;
+               case 'W':
+                       local_flags |= LOCAL_SET_LDAP_ADMIN_PW;
+                       *ldap_secret = '\0';
                        break;
                }
                case 'h':
@@ -290,20 +168,161 @@ static int process_root(int argc, char *argv[])
                        usage();
                }
        }
-       
+
        argc -= optind;
        argv += optind;
 
-#ifdef WITH_LDAP_SAM
-       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))
+       switch(argc) {
+       case 0:
+               if (!got_username)
+                       fstrcpy(user_name, "");
+               break;
+       case 1:
+               if (!(local_flags & LOCAL_AM_ROOT)) {
+                       usage();
+               } else {
+                       if (got_username) {
+                               usage();
+                       } else {
+                               fstrcpy(user_name, argv[0]);
+                       }
+               }
+               break;
+       default:
+               usage();
+       }
+
+       if (!lp_load(configfile,True,False,False,True)) {
+               fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
+                       configfile);
+               exit(1);
+       }
+
+       return local_flags;
+}
+
+/*************************************************************
+ Utility function to prompt for new password.
+*************************************************************/
+static char *prompt_for_new_password(bool stdin_get)
+{
+       char *p;
+       fstring new_pw;
+
+       ZERO_ARRAY(new_pw);
+
+       p = get_pass("New SMB password:", stdin_get);
+
+       fstrcpy(new_pw, p);
+       SAFE_FREE(p);
+
+       p = get_pass("Retype new SMB password:", stdin_get);
+
+       if (strcmp(p, new_pw)) {
+               fprintf(stderr, "Mismatch - password unchanged.\n");
+               ZERO_ARRAY(new_pw);
+               SAFE_FREE(p);
+               return NULL;
+       }
+
+       return p;
+}
+
+
+/*************************************************************
+ Change a password either locally or remotely.
+*************************************************************/
+
+static NTSTATUS password_change(const char *remote_mach, char *username, 
+                               char *old_passwd, char *new_pw,
+                               int local_flags)
+{
+       NTSTATUS ret;
+       char *err_str = NULL;
+       char *msg_str = 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 */
+                       fprintf(stderr, "Invalid remote operation!\n");
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
+               ret = remote_password_change(remote_mach, username,
+                                            old_passwd, new_pw, &err_str);
+       } else {
+               ret = local_password_change(username, local_flags, new_pw,
+                                           &err_str, &msg_str);
+       }
+
+       if (msg_str) {
+               printf("%s", msg_str);
+       }
+       if (err_str) {
+               fprintf(stderr, "%s", err_str);
+       }
+       if (!NT_STATUS_IS_OK(ret) && !err_str) {
+               fprintf(stderr, "Failed to change password!\n");
+       }
+
+       SAFE_FREE(msg_str);
+       SAFE_FREE(err_str);
+       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 local_flags)
+{
+       struct passwd  *pwd;
+       int result = 0;
+       char *old_passwd = NULL;
+
+       if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) {
+               char *ldap_admin_dn = lp_ldap_admin_dn();
+               if ( ! *ldap_admin_dn ) {
+                       DEBUG(0,("ERROR: 'ldap admin dn' not defined! Please check your smb.conf\n"));
+                       goto done;
+               }
+
+               printf("Setting stored password for \"%s\" in secrets.tdb\n", ldap_admin_dn);
+               if ( ! *ldap_secret ) {
+                       new_passwd = prompt_for_new_password(stdin_passwd_get);
+                       fstrcpy(ldap_secret, new_passwd);
+               }
+               if (!store_ldap_admin_pw(ldap_secret)) {
                        DEBUG(0,("ERROR: Failed to store the ldap admin password!\n"));
+               }
                goto done;
        }
-#endif
+
+       /* Ensure passdb startup(). */
+       if(!initialize_password_db(False, NULL)) {
+               DEBUG(0, ("Failed to open passdb!\n"));
+               exit(1);
+       }
+
+       /* Ensure we have a SAM sid. */
+       get_global_sam_sid();
+
        /*
         * Ensure both add/delete user are not set
         * Ensure add/delete user and either remote machine or join domain are
@@ -314,39 +333,16 @@ static int process_root(int argc, char *argv[])
                (remote_machine != NULL))) {
                usage();
        }
-       
+
        /* Only load interfaces if we are doing network operations. */
 
        if (remote_machine) {
                load_interfaces();
        }
 
-       /*
-        * Deal with root - can add a user, but only locally.
-        */
-
-       switch(argc) {
-       case 0:
-               if (!got_username)
-                       fstrcpy(user_name, "");
-               break;
-       case 1:
-               if (got_username)
-                       usage();
-               fstrcpy(user_name, argv[0]);
-               break;
-       case 2:
-               if (got_username || got_pass)
-                       usage();
-               fstrcpy(user_name, argv[0]);
-               new_passwd = smb_xstrdup(argv[1]);
-               break;
-       default:
-               usage();
-       }
-
-       if (!user_name[0] && (pwd = sys_getpwuid(geteuid()))) {
+       if (!user_name[0] && (pwd = getpwuid_alloc(talloc_tos(), geteuid()))) {
                fstrcpy(user_name, pwd->pw_name);
+               TALLOC_FREE(pwd);
        } 
 
        if (!user_name[0]) {
@@ -370,7 +366,7 @@ static int process_root(int argc, char *argv[])
                if (local_flags & LOCAL_ADD_USER) {
                        SAFE_FREE(new_passwd);
                        new_passwd = smb_xstrdup(user_name);
-                       strlower(new_passwd);
+                       strlower_m(new_passwd);
                }
 
                /*
@@ -383,7 +379,7 @@ static int process_root(int argc, char *argv[])
        } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
                static fstring buf;
 
-               if (local_flags & LOCAL_ADD_USER) {
+               if ((local_flags & LOCAL_ADD_USER) && (new_passwd == NULL)) {
                        /*
                         * Prompt for trusting domain's account password
                         */
@@ -393,17 +389,23 @@ static int process_root(int argc, char *argv[])
                                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(!old_passwd) {
+                               fprintf(stderr, "Unable to get old password.\n");
+                               exit(1);
+                       }
                }
-               
+
                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
@@ -412,23 +414,31 @@ static int process_root(int argc, char *argv[])
                         * password. If not (ie. they have a no stored password in the
                         * smbpasswd file) then we need to prompt for a new password.
                         */
-                       
+
                        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)) {
+                               struct samu *sampass = NULL;
+
+                               sampass = samu_new( NULL );
+                               if (!sampass) {
+                                       fprintf(stderr, "talloc fail for struct samu.\n");
+                                       exit(1);
+                               }
+                               if (!pdb_getsampwnam(sampass, user_name)) {
+                                       fprintf(stderr, "Failed to find user %s in passdb backend.\n",
+                                               user_name );
+                                       exit(1);
+                               }
+
+                               if(pdb_get_nt_passwd(sampass) == NULL) {
                                        local_flags |= LOCAL_SET_PASSWORD;
                                }
-                               pdb_free_sam(&sampass);
+                               TALLOC_FREE(sampass);
                        }
                }
-               
-               if(local_flags & LOCAL_SET_PASSWORD) {
+
+               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);
@@ -436,8 +446,9 @@ static int process_root(int argc, char *argv[])
                }
        }
 
-       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);
+       if (!NT_STATUS_IS_OK(password_change(remote_machine, user_name,
+                                            old_passwd, new_passwd,
+                                            local_flags))) {
                result = 1;
                goto done;
        } 
@@ -445,83 +456,65 @@ static int process_root(int argc, char *argv[])
        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;
-               
-               pdb_init_sam(&sampass);
-               ret = pdb_getsampwnam(sampass, user_name);
+               struct samu *sampass = NULL;
+
+               sampass = samu_new( NULL );
+               if (!sampass) {
+                       fprintf(stderr, "talloc fail for struct samu.\n");
+                       exit(1);
+               }
+
+               if (!pdb_getsampwnam(sampass, user_name)) {
+                       fprintf(stderr, "Failed to find user %s in passdb backend.\n",
+                               user_name );
+                       exit(1);
+               }
 
                printf("Password changed for user %s.", user_name );
-               if( (ret != False) && (pdb_get_acct_ctrl(sampass)&ACB_DISABLED) )
+               if(pdb_get_acct_ctrl(sampass)&ACB_DISABLED) {
                        printf(" User has disabled flag set.");
-               if((ret != False) && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) )
+               }
+               if(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) {
                        printf(" User has no password flag set.");
+               }
                printf("\n");
-               pdb_free_sam(&sampass);
+               TALLOC_FREE(sampass);
        }
 
  done:
+       SAFE_FREE(old_passwd);
        SAFE_FREE(new_passwd);
        return result;
 }
 
 
-/**
-   handle password changing for non-root
-**/
-static int process_nonroot(int argc, char *argv[])
+/*************************************************************
+ Handle password changing for non-root.
+*************************************************************/
+
+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(talloc_tos(), getuid());
                if (pwd) {
-                       user_name = smb_xstrdup(pwd->pw_name);
+                       fstrcpy(user_name,pwd->pw_name);
+                       TALLOC_FREE(pwd);
                } else {
-                       fprintf(stderr, "smbpasswd: you don't exist - go away\n");
+                       fprintf(stderr, "smbpasswd: cannot lookup user name for uid %u\n", (unsigned int)getuid());
                        exit(1);
                }
        }
-       
+
        /*
         * A non-root user is always setting a password
         * via a remote machine (even if that machine is
@@ -535,20 +528,22 @@ 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);
        }
-       
-       if (!new_passwd) {
+       else
+               new_pw = smb_xstrdup(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)) {
-               fprintf(stderr,"Failed to change password for %s\n", user_name);
+       if (!NT_STATUS_IS_OK(password_change(remote_machine, user_name, old_pw,
+                                            new_pw, 0))) {
                result = 1;
                goto done;
        }
@@ -556,8 +551,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;
 }
@@ -569,32 +564,31 @@ static int process_nonroot(int argc, char *argv[])
 **********************************************************/
 int main(int argc, char **argv)
 {      
-       AllowDebugChange = False;
+       TALLOC_CTX *frame = talloc_stackframe();
+       int local_flags = 0;
+       int ret;
 
 #if defined(HAVE_SET_AUTH_PARAMETERS)
        set_auth_parameters(argc, argv);
 #endif /* HAVE_SET_AUTH_PARAMETERS */
 
-       setup_logging("smbpasswd", True);
-       
-       if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
-               fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
-                       dyn_CONFIGFILE);
-               exit(1);
+       if (getuid() == 0) {
+               local_flags = LOCAL_AM_ROOT;
        }
 
+       load_case_tables();
+
+       local_flags = process_options(argc, argv, local_flags);
+
+       setup_logging("smbpasswd", DEBUG_STDERR);
+
        /*
         * Set the machine NETBIOS name if not already
         * set from the config file. 
         */ 
-    
-       if (!*global_myname) {   
-               char *p;
-               fstrcpy(global_myname, myhostname());
-               p = strchr_m(global_myname, '.' );
-               if (p) *p = 0;
-       }           
-       strupper(global_myname);
+
+       if (!init_names())
+               return 1;
 
        /* Check the effective uid - make sure we are not setuid */
        if (is_setuid_root()) {
@@ -602,17 +596,12 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       /* pre-check for local mode option as first option. We can't
-          do this via normal getopt as getopt can't be called
-          twice. */
-       if (argc > 1 && strcmp(argv[1], "-L") == 0) {
-               local_mode = True;
-       }
-
-       if (local_mode || getuid() == 0) {
+       if (local_flags & LOCAL_AM_ROOT) {
                secrets_init();
-               return process_root(argc, argv);
+               return process_root(local_flags);
        } 
 
-       return process_nonroot(argc, argv);
+       ret = process_nonroot(local_flags);
+       TALLOC_FREE(frame);
+       return ret;
 }