Make the smbpasswd options/usage message a little less bizarre: it now
[ira/wip.git] / source3 / utils / smbpasswd.c
index f9b95062976a27925f4ad04c0f4909cf6268790d..ea8fffc2951d6e09f4642f845bc356a9c12e2ce3 100644 (file)
@@ -1,11 +1,12 @@
 /*
- * Unix SMB/Netbios implementation. Version 1.9. smbpasswd module. Copyright
- * (C) Jeremy Allison 1995-1998
+ * Unix SMB/Netbios 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 myhostname;
 extern pstring global_myname;
-extern fstring global_myworkgroup;
 
-static char *prog_name;
+/*
+ * Next two lines needed for SunOS and don't
+ * hurt anything else...
+ */
+extern char *optarg;
+extern int optind;
 
-/*********************************************************
- Print command usage on stderr and die.
-**********************************************************/
+/** forced running in root-mode **/
+static BOOL local_mode;
 
-static void usage(char *name, BOOL is_root)
+/**
+ * Print command usage on stderr and die.
+ **/
+static void usage(void)
 {
-       if(is_root)
-               fprintf(stderr, "Usage is : %s [-D DEBUGLEVEL] [-a] [-d] [-m] [-n] [username] [password]\n\
-%s: [-R <name resolve order>] [-D DEBUGLEVEL] [-j DOMAINNAME] [-r machine] [-U remote_username] [username] [password]\n%s: [-h]\n", name, name, name);
-       else
-               fprintf(stderr, "Usage is : %s [-h] [-D DEBUGLEVEL] [-r machine] [-U remote_username] [password]\n", name);
+       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("  -s                   use stdin for password prompt\n");
+       printf("  -D LEVEL             debug level\n");
+       printf("  -U USER              remote username\n");
+       printf("  -r MACHINE           remote machine\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("  -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)
+{
+       pstring remote_machine;
+       fstring trust_passwd;
+       unsigned char orig_trust_passwd_hash[16];
+       BOOL ret;
+
+       pstrcpy(remote_machine, remote ? remote : "");
+       fstrcpy(trust_passwd, global_myname);
+       strlower(trust_passwd);
+       E_md4hash( (uchar *)trust_passwd, orig_trust_passwd_hash);
+
+       /* Ensure that we are not trying to join a
+          domain if we are locally set up as a domain
+          controller. */
+
+       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;
+       }
+
+       /*
+        * 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;
+       }
+       
+       /*
+        * If we are given a remote machine assume this is the PDC.
+        */
+       
+       if(remote == NULL) {
+               pstrcpy(remote_machine, lp_passwordserver());
+       }
+
+       if(!*remote_machine) {
+               fprintf(stderr, "No password server list given in smb.conf - \
+unable to join domain.\n");
+               return 1;
+       }
+
+       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);
+       }
+       
+       return (int)ret;
+}
 
-static int join_domain( char *domain, char *remote)
+/* Initialise client credentials for authenticated pipe access */
+
+void init_rpcclient_creds(struct ntuser_creds *creds, char* username,
+                         char* domain, char* password)
 {
-  pstring remote_machine;
-  fstring trust_passwd;
-  unsigned char orig_trust_passwd_hash[16];
-  BOOL ret;
-
-  pstrcpy(remote_machine, remote ? remote : "");
-  fstrcpy(trust_passwd, global_myname);
-  strlower(trust_passwd);
-  E_md4hash( (uchar *)trust_passwd, orig_trust_passwd_hash);
-
-  /* Ensure that we are not trying to join a
-     domain if we are locally set up as a domain
-     controller. */
-
-  if(lp_domain_controller() && strequal(lp_workgroup(), domain)) {
-    fprintf(stderr, "%s: Cannot join domain %s as we already configured as \
-domain controller for that domain.\n", prog_name, domain);
-    return 1;
-  }
-
-  /*
-   * Create the machine account password file.
-   */
-  if(!trust_password_lock( domain, global_myname, True)) {
-    fprintf(stderr, "%s: unable to open the machine account password file for \
-machine %s in domain %s.\n", prog_name, global_myname, domain); 
-    return 1;
-  }
-
-  /*
-   * Write the old machine account password.
-   */
-
-  if(!set_trust_account_password( orig_trust_passwd_hash)) {              
-    fprintf(stderr, "%s: unable to write the machine account password for \
-machine %s in domain %s.\n", prog_name, global_myname, domain);
-    trust_password_unlock();
-    return 1;
-  }
-
-  /*
-   * If we are given a remote machine assume this is the PDC.
-   */
-
-  if(remote == NULL)
-    pstrcpy(remote_machine, lp_passwordserver());
-
-  if(!*remote_machine) {
-    fprintf(stderr, "%s: No password server list given in smb.conf - \
-unable to join domain.\n", prog_name);
-    trust_password_unlock();
-    return 1;
-  }
-
-  ret = change_trust_account_password( domain, remote_machine);
-  trust_password_unlock();
-
-  if(!ret) {
-    trust_password_delete( domain, global_myname);
-    fprintf(stderr,"%s: Unable to join domain %s.\n", prog_name, domain);
-  } else {
-    printf("%s: Joined domain %s.\n", prog_name, domain);
-  }
-
-  return (int)ret;
+       ZERO_STRUCTP(creds);
+       
+       if (lp_encrypted_passwords()) {
+               pwd_make_lm_nt_16(&creds->pwd, password);
+       } else {
+               pwd_set_cleartext(&creds->pwd, password);
+       }
+
+       fstrcpy(creds->user_name, username);
+       fstrcpy(creds->domain, domain);
 }
 
 /*********************************************************
- Start here.
+Join a domain using the administrator username and password
 **********************************************************/
 
-int main(int argc, char **argv)
-{
-  extern char *optarg;
-  extern int optind;
-  extern int DEBUGLEVEL;
-  int             real_uid;
-  struct passwd  *pwd;
-  fstring         old_passwd;
-  fstring         new_passwd;
-  uchar           new_p16[16];
-  uchar           new_nt_p16[16];
-  char           *p;
-  struct smb_passwd *smb_pwent;
-  FILE           *fp;
-  int             ch;
-  int             err;
-  BOOL is_root = False;
-  pstring  user_name;
-  BOOL remote_user_name = False;
-  char *remote_machine = NULL;
-  BOOL add_user = False;
-  BOOL got_new_pass = False;
-  BOOL trust_account = False;
-  BOOL disable_user = False;
-  BOOL set_no_password = False;
-  BOOL joining_domain = False;
-  char *new_domain = NULL;
-  pstring servicesf = CONFIGFILE;
-  void           *vp;
-
-  new_passwd[0] = '\0';
-  user_name[0] = '\0';
-
-  memset(old_passwd, '\0', sizeof(old_passwd));
-  memset(new_passwd, '\0', sizeof(new_passwd));
-
-  prog_name = argv[0];
-
-  TimeInit();
-
-  setup_logging(prog_name,True);
-  
-  charset_initialise();
-
-  if(!initialize_password_db()) {
-    fprintf(stderr, "%s: Can't setup password database vectors.\n", prog_name);
-    exit(1);
-  }
-
-  if (!lp_load(servicesf,True,False,False)) {
-    fprintf(stderr, "%s: Can't load %s - run testparm to debug it\n", prog_name, servicesf);
-    exit(1);
-  }
-
-  if(!get_myname(myhostname,NULL)) {
-    fprintf(stderr, "%s: unable to get my hostname.\n", prog_name );
-    exit(1);
-  }
-
-  /*
-   * Set the machine NETBIOS name if not already
-   * set from the config file. 
-   */ 
-    
-  if (!*global_myname)
-  {   
-    fstrcpy( global_myname, myhostname );
-    p = strchr( global_myname, '.' );
-    if (p) 
-      *p = 0;
-  }           
-  strupper( global_myname );
-
-  codepage_initialise(lp_client_code_page());
-
-  /* Get the real uid */
-  real_uid = getuid();
-  
-  /* Check the effective uid */
-  if ((geteuid() == 0) && (real_uid != 0)) {
-    fprintf(stderr, "%s: Must *NOT* be setuid root.\n", prog_name);
-    exit(1);
-  }
-
-  is_root = (real_uid == 0);
-
-  while ((ch = getopt(argc, argv, "adhmnj:r:R:D:U:")) != EOF) {
-    switch(ch) {
-    case 'a':
-      if(is_root)
-        add_user = True;
-      else
-        usage(prog_name, is_root);
-      break;
-    case 'd':
-      if(is_root) {
-        disable_user = True;
-        got_new_pass = True;
-        fstrcpy(new_passwd, "XXXXXX");
-      } else
-        usage(prog_name, is_root);
-      break;
-    case 'D':
-      DEBUGLEVEL = atoi(optarg);
-      break;
-    case 'n':
-      if(is_root) {
-        set_no_password = True;
-        got_new_pass = True;
-        fstrcpy(new_passwd, "NO PASSWORD");
-      } else
-        usage(prog_name, is_root);
-    case 'r':
-      remote_machine = optarg;
-      break;
-    case 'R':
-      if(is_root) {
-        lp_set_name_resolve_order(optarg);
-        break;
-      } else
-        usage(prog_name, is_root);
-    case 'm':
-      if(is_root) {
-        trust_account = True;
-      } else
-        usage(prog_name, is_root);
-      break;
-    case 'j':
-      if(is_root) {
-        new_domain = optarg;
-        strupper(new_domain);
-        joining_domain = True;
-      } else
-        usage(prog_name, is_root);  
-      break;
-    case 'U':
-      remote_user_name = True;
-      pstrcpy(user_name, optarg);
-      break;
-    case 'h':
-    default:
-      usage(prog_name, is_root);
-    }
-  }
-
-  argc -= optind;
-  argv += optind;
-
-  if (!is_root && remote_user_name && !remote_machine) {
-    fprintf(stderr, "%s: You can only use -U with -r.\n", prog_name);
-    usage(prog_name, False);
-  }
-
-  /*
-   * Ensure add_user and either remote machine or join domain are
-   * not both set.
-   */
-
-  if(add_user && ((remote_machine != NULL) || joining_domain))
-    usage(prog_name, True);
-
-  /*
-   * Deal with joining a domain.
-   */
-  if(joining_domain && argc != 0)
-    usage(prog_name, True);
-
-  if(joining_domain) {
-    return join_domain( new_domain, remote_machine);
-  }
-
-  if(is_root) {
-
-    /*
-     * Deal with root - can add a user, but only locally.
-     */
-
-    switch(argc) {
-      case 0:
-        break;
-      case 1:
-        /* If we are root we can change another's password. */
-        pstrcpy(user_name, argv[0]);
-        break;
-      case 2:
-        pstrcpy(user_name, argv[0]);
-        fstrcpy(new_passwd, argv[1]);
-        got_new_pass = True;
-        break;
-      default:
-        usage(prog_name, True);
-    }
-
-    if(*user_name) {
-
-      if(trust_account) {
-        int username_len = strlen(user_name);
-        if(username_len >= sizeof(pstring) - 1) {
-          fprintf(stderr, "%s: machine account name too long.\n", user_name);
-          exit(1);
+/* Macro for checking RPC error codes to make things more readable */
+
+#define CHECK_RPC_ERR(rpc, msg) \
+        if (!NT_STATUS_IS_OK(result = rpc)) { \
+                DEBUG(0, (msg ": %s\n", get_nt_error_msg(result))); \
+                goto done; \
         }
 
-        if(user_name[username_len-1] != '$') {
-          user_name[username_len] = '$';
-          user_name[username_len+1] = '\0';
+#define CHECK_RPC_ERR_DEBUG(rpc, debug_args) \
+        if (!NT_STATUS_IS_OK(result = rpc)) { \
+                DEBUG(0, debug_args); \
+                goto done; \
         }
-      }
-
-      if(!remote_machine && ((pwd = Get_Pwnam(user_name, True)) == NULL)) {
-        fprintf(stderr, "%s: User \"%s\" was not found in system password file.\n", 
-                    prog_name, user_name);
-        exit(1);
-      }
-    } else {
-      if((pwd = getpwuid(real_uid)) != NULL)
-        pstrcpy( user_name, pwd->pw_name);
-    }
-
-  } else {
-
-    if(add_user) {
-      fprintf(stderr, "%s: Only root can set anothers password.\n", prog_name);
-      usage(prog_name, False);
-    }
-
-    if(argc > 1)
-      usage(prog_name, False);
-
-    if(argc == 1) {
-      fstrcpy(new_passwd, argv[0]);
-      got_new_pass = True;
-    }
-
-    if(!remote_user_name && ((pwd = getpwuid(real_uid)) != NULL))
-      pstrcpy( user_name, pwd->pw_name);
-
-    /*
-     * A non-root user is always setting a password
-     * via a remote machine (even if that machine is
-     * localhost).
-     */
-
-    if(remote_machine == NULL)
-      remote_machine = "127.0.0.1";
-  }    
-    
-  if (*user_name == '\0') {
-    fprintf(stderr, "%s: Unable to get a user name for password change.\n", prog_name);
-    exit(1);
-  }
-
-  /*
-   * If we are adding a machine account then pretend
-   * we already have the new password, we will be using
-   * the machinename as the password.
-   */
-
-  if(add_user && trust_account) {
-    got_new_pass = True;
-    strncpy(new_passwd, user_name, sizeof(fstring));
-    new_passwd[sizeof(fstring)-1] = '\0';
-    strlower(new_passwd);
-    if(new_passwd[strlen(new_passwd)-1] == '$')
-      new_passwd[strlen(new_passwd)-1] = '\0';
-  }
-
-  /* 
-   * If we are root we don't ask for the old password (unless it's on a
-   * remote machine.
-   */
-
-  if (remote_machine != NULL) {
-    p = getpass("Old SMB password:");
-    fstrcpy(old_passwd, p);
-  }
-
-  if (!got_new_pass) {
-    new_passwd[0] = '\0';
-
-    p = getpass("New SMB password:");
-
-    strncpy(new_passwd, p, sizeof(fstring));
-    new_passwd[sizeof(fstring)-1] = '\0';
-
-    p = getpass("Retype new SMB password:");
-
-    if (strncmp(p, new_passwd, sizeof(fstring)-1))
-    {
-      fprintf(stderr, "%s: Mismatch - password unchanged.\n", prog_name);
-      exit(1);
-    }
-  }
-  
-  if (new_passwd[0] == '\0') {
-    printf("Password not set\n");
-    exit(0);
-  }
-  /* 
-   * Now do things differently depending on if we're changing the
-   * password on a remote machine. Remember - a normal user is
-   * always using this code, looping back to the local smbd.
-   */
-
-  if(remote_machine != NULL) {
-    struct cli_state cli;
-    struct in_addr ip;
-
-    if(!resolve_name( remote_machine, &ip)) {
-      fprintf(stderr, "%s: unable to find an IP address for machine %s.\n",
-              prog_name, remote_machine );
-      exit(1);
-    }
-    memset(&cli, '\0', sizeof(struct cli_state));
+
+static int join_domain_byuser(char *domain, char *remote_machine,
+                             char *username, char *password)
+{
+       /* libsmb variables */
+
+       struct nmb_name calling, called;
+       struct ntuser_creds creds;
+       struct cli_state cli;
+       fstring dest_host, acct_name;
+       struct in_addr dest_ip;
+       TALLOC_CTX *mem_ctx;
+        uint32 acb_info;
+
+       /* rpc variables */
+
+       POLICY_HND lsa_pol, sam_pol, domain_pol, user_pol;
+       DOM_SID domain_sid;
+       uint32 user_rid;
+
+       /* Password stuff */
+
+       char *machine_pwd;
+       int plen = 0;
+       uchar pwbuf[516], ntpw[16], sess_key[16];
+       SAM_USERINFO_CTR ctr;
+       SAM_USER_INFO_24 p24;
+       SAM_USER_INFO_10 p10;
+
+       /* Misc */
+
+       NTSTATUS result;
+       int retval = 1;
+
+       /* Connect to remote machine */
+
+       ZERO_STRUCT(cli);
+       ZERO_STRUCT(creds);
+
+       if (!(mem_ctx = talloc_init())) {
+               DEBUG(0, ("Could not initialise talloc context\n"));
+               goto done;
+       }
+
+       if (!cli_initialise(&cli)) {
+               DEBUG(0, ("Could not initialise client structure\n"));
+               goto done;
+       }
+
+       init_rpcclient_creds(&creds, username, domain, password);
+       cli_init_creds(&cli, &creds);
+
+       if (!resolve_srv_name(remote_machine, dest_host, &dest_ip)) {
+               DEBUG(0, ("Could not resolve name %s\n", remote_machine));
+               goto done;
+       }
+
+       make_nmb_name(&called, dns_to_netbios_name(dest_host), 0x20);
+       make_nmb_name(&calling, dns_to_netbios_name(global_myname), 0);
+
+       if (!cli_establish_connection(&cli, dest_host, &dest_ip, &calling, 
+                                     &called, "IPC$", "IPC", False, True)) {
+               DEBUG(0, ("Error connecting to %s\n", dest_host));
+               goto done;
+       }
+
+       /* Fetch domain sid */
+
+       if (!cli_nt_session_open(&cli, PIPE_LSARPC)) {
+               DEBUG(0, ("Error connecting to SAM pipe\n"));
+               goto done;
+       }
+
+
+       CHECK_RPC_ERR(cli_lsa_open_policy(&cli, mem_ctx, True,
+                                         SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                         &lsa_pol),
+                     "error opening lsa policy handle");
+
+       CHECK_RPC_ERR(cli_lsa_query_info_policy(&cli, mem_ctx, &lsa_pol,
+                                               5, domain, &domain_sid),
+                     "error querying info policy");
+
+       cli_lsa_close(&cli, mem_ctx, &lsa_pol);
+
+       cli_nt_session_close(&cli); /* Done with this pipe */
+
+       /* Create domain user */
+
+       if (!cli_nt_session_open(&cli, PIPE_SAMR)) {
+               DEBUG(0, ("Error connecting to SAM pipe\n"));
+               goto done;
+       }
+
+       CHECK_RPC_ERR(cli_samr_connect(&cli, mem_ctx, 
+                                      SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                      &sam_pol),
+                     "could not connect to SAM database");
+
+       
+       CHECK_RPC_ERR(cli_samr_open_domain(&cli, mem_ctx, &sam_pol,
+                                          SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                          &domain_sid, &domain_pol),
+                     "could not open domain");
+
+       /* Create domain user */
+
+       fstrcpy(acct_name, global_myname);
+       fstrcat(acct_name, "$");
+
+       strlower(acct_name);
+
+        acb_info = (lp_server_role() == ROLE_DOMAIN_BDC) ? ACB_SVRTRUST :
+                ACB_WSTRUST;
+
+       {
+               uint32 unknown = 0xe005000b;
+
+               result = cli_samr_create_dom_user(&cli, mem_ctx, &domain_pol,
+                                                 acct_name, acb_info,
+                                                 unknown, &user_pol, 
+                                                 &user_rid);
+
+               /* We *must* do this.... don't ask... */
+
+               CHECK_RPC_ERR_DEBUG(cli_samr_close(&cli, mem_ctx, &user_pol), ("error closing user policy"));
+               result = NT_STATUS_USER_EXISTS;
+       }       
+
+       if (NT_STATUS_V(result) == NT_STATUS_V(NT_STATUS_USER_EXISTS)) {
+               uint32 num_rids, *name_types, *user_rids;
+               uint32 flags = 0x3e8;
+               char *names;
+               
+               /* Look up existing rid */
+               
+               names = (char *)&acct_name[0];
+
+               CHECK_RPC_ERR_DEBUG(
+                       cli_samr_lookup_names(&cli, mem_ctx,
+                                             &domain_pol, flags,
+                                             1, &names, &num_rids,
+                                             &user_rids, &name_types),
+                       ("error looking up rid for user %s: %s\n",
+                        acct_name, get_nt_error_msg(result)));
+
+               if (name_types[0] != SID_NAME_USER) {
+                       DEBUG(0, ("%s is not a user account\n", acct_name));
+                       goto done;
+               }
+
+               user_rid = user_rids[0];
+               
+               /* Open handle on user */
+
+               CHECK_RPC_ERR_DEBUG(
+                       cli_samr_open_user(&cli, mem_ctx, &domain_pol,
+                                          SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                          user_rid, &user_pol),
+                       ("could not re-open existing user %s: %s\n",
+                        acct_name, get_nt_error_msg(result)));
+               
+       } else if (!NT_STATUS_IS_OK(result)) {
+               DEBUG(0, ("error creating domain user: %s\n",
+                         get_nt_error_msg(result)));
+               goto done;
+       }
+
+       /* Create a random machine account password */
+
+       {
+               UNISTR2 upw;    /* Unicode password */
+
+               upw.buffer = (uint16 *)talloc_zero(mem_ctx, 0xc * 
+                                                  sizeof(uint16));
+
+               upw.uni_str_len = 0xc;
+               upw.uni_max_len = 0xc;
+
+               machine_pwd = (char *)upw.buffer;
+               plen = upw.uni_str_len * 2;
+               generate_random_buffer((unsigned char *)machine_pwd, plen, True);
+
+               encode_pw_buffer((char *)pwbuf, machine_pwd, plen, False);
+
+               nt_owf_genW(&upw, ntpw);
+       }
+
+       /* Set password on machine account */
+
+       ZERO_STRUCT(ctr);
+       ZERO_STRUCT(p24);
+
+       init_sam_user_info24(&p24, (char *)pwbuf,24);
+
+       ctr.switch_value = 24;
+       ctr.info.id24 = &p24;
+
+       /* I don't think this is quite the right place for this
+          calculation.  It should be moved somewhere where the credentials
+          are calculated. )-: */
+
+       mdfour(sess_key, cli.pwd.smb_nt_pwd, 16);
+
+       CHECK_RPC_ERR(cli_samr_set_userinfo(&cli, mem_ctx, &user_pol, 24, 
+                                           sess_key, &ctr),
+                     "error setting trust account password");
+
+       /* Why do we have to try to (re-)set the ACB to be the same as what
+          we passed in the samr_create_dom_user() call?  When a NT
+          workstation is joined to a domain by an administrator the
+          acb_info is set to 0x80.  For a normal user with "Add
+          workstations to the domain" rights the acb_info is 0x84.  I'm
+          not sure whether it is supposed to make a difference or not.  NT
+          seems to cope with either value so don't bomb out if the set
+          userinfo2 level 0x10 fails.  -tpot */
+
+       ZERO_STRUCT(ctr);
+       ctr.switch_value = 0x10;
+       ctr.info.id10 = &p10;
+
+       init_sam_user_info10(&p10, acb_info);
+
+       /* Ignoring the return value is necessary for joining a domain
+          as a normal user with "Add workstation to domain" privilege. */
+
+       result = cli_samr_set_userinfo2(&cli, mem_ctx, &user_pol, 0x10, 
+                                       sess_key, &ctr);
+
+       /* Now store the secret in the secrets database */
+
+       strupper(domain);
+
+       if (!secrets_store_domain_sid(domain, &domain_sid) ||
+           !secrets_store_trust_account_password(domain, ntpw)) {
+               DEBUG(0, ("error storing domain secrets\n"));
+               goto done;
+       }
+
+       retval = 0;             /* Success! */
+
+ done:
+       /* Close down pipe - this will clean up open policy handles */
+
+       if (cli.nt_pipe_fnum)
+               cli_nt_session_close(&cli);
+
+       /* Display success or failure */
+
+       if (retval != 0) {
+               trust_password_delete(domain);
+               fprintf(stderr,"Unable to join domain %s.\n",domain);
+       } else {
+               printf("Joined domain %s.\n",domain);
+       }
+       
+       return retval;
+}
+
+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 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);
  
-    if (!cli_initialise(&cli) || !cli_connect(&cli, remote_machine, &ip)) {
-      fprintf(stderr, "%s: unable to connect to SMB server on machine %s. Error was : %s.\n",
-              prog_name, remote_machine, cli_errstr(&cli) );
-      exit(1);
-    }
-  
-    if (!cli_session_request(&cli, remote_machine, 0x20, global_myname)) {
-      fprintf(stderr, "%s: machine %s rejected the session setup. Error was : %s.\n",
-              prog_name, remote_machine, cli_errstr(&cli) );
-      cli_shutdown(&cli);
-      exit(1);
-    }
-  
-    cli.protocol = PROTOCOL_NT1;
-
-    if (!cli_negprot(&cli)) {
-      fprintf(stderr, "%s: machine %s rejected the negotiate protocol. Error was : %s.\n",        
-              prog_name, remote_machine, cli_errstr(&cli) );
-      cli_shutdown(&cli);
-      exit(1);
-    }
-  
-    if (!cli_session_setup(&cli, user_name, old_passwd, strlen(old_passwd),
-                           "", 0, "")) {
-      fprintf(stderr, "%s: machine %s rejected the session setup. Error was : %s.\n",        
-              prog_name, remote_machine, cli_errstr(&cli) );
-      cli_shutdown(&cli);
-      exit(1);
-    }               
-
-    if (!cli_send_tconX(&cli, "IPC$", "IPC", "", 1)) {
-      fprintf(stderr, "%s: machine %s rejected the tconX on the IPC$ share. Error was : %s.\n",
-              prog_name, remote_machine, cli_errstr(&cli) );
-      cli_shutdown(&cli);
-      exit(1);
-    }
-
-    if(!cli_oem_change_password(&cli, user_name, new_passwd, old_passwd)) {
-      fprintf(stderr, "%s: machine %s rejected the password change: Error was : %s.\n",
-              prog_name, remote_machine, cli_errstr(&cli) );
-      cli_shutdown(&cli);
-      exit(1);
-    }
-
-    cli_shutdown(&cli);
-    exit(0);
-  }
-
-  /*
-   * Check for a machine account.
-   */
-
-  if(trust_account && !pwd) {
-    fprintf(stderr, "%s: User %s does not exist in system password file \
-(usually /etc/passwd). Cannot add machine account without a valid system user.\n",
-           prog_name, user_name);
-    exit(1);
-  }
-
-  /* Calculate the MD4 hash (NT compatible) of the new password. */
-  
-  memset(new_nt_p16, '\0', 16);
-  E_md4hash((uchar *) new_passwd, new_nt_p16);
-  
-  /* Mangle the password into Lanman format */
-  new_passwd[14] = '\0';
-  strupper(new_passwd);
-  
-  /*
-   * Calculate the SMB (lanman) hash functions of the new password.
-   */
-  
-  memset(new_p16, '\0', 16);
-  E_P16((uchar *) new_passwd, new_p16);
-  
-  /*
-   * Open the smbpaswd file.
-   */
-  vp = startsmbpwent(True);
-  if (!vp && errno == ENOENT) {
-         fp = fopen(lp_smb_passwd_file(), "w");
-         if (fp) {
-                 fprintf(fp, "# Samba SMB password file\n");
-                 fclose(fp);
-                 vp = startsmbpwent(True);
-         }
-  }
-  if (!vp) {
-         err = errno;
-         fprintf(stderr, "%s: Failed to open password file %s.\n",
-                 prog_name, lp_smb_passwd_file());
-         errno = err;
-         perror(prog_name);
-         exit(err);
-  }
-  
-  /* Get the smb passwd entry for this user */
-  smb_pwent = getsmbpwnam(user_name);
-  if (smb_pwent == NULL) {
-    if(add_user == False) {
-      fprintf(stderr, "%s: Failed to find entry for user %s.\n",
-             prog_name, pwd->pw_name);
-      endsmbpwent(vp);
-      exit(1);
-    }
-
-    /* Create a new smb passwd entry and set it to the given password. */
-    {
-      struct smb_passwd new_smb_pwent;
-
-      new_smb_pwent.smb_userid = pwd->pw_uid;
-      new_smb_pwent.smb_name = pwd->pw_name; 
-      new_smb_pwent.smb_passwd = NULL;
-      new_smb_pwent.smb_nt_passwd = NULL;
-      new_smb_pwent.acct_ctrl = (trust_account ? ACB_WSTRUST : ACB_NORMAL);
-
-      if(disable_user) {
-        new_smb_pwent.acct_ctrl |= ACB_DISABLED;
-      } else if (set_no_password) {
-        new_smb_pwent.acct_ctrl |= ACB_PWNOTREQ;
-      } else {
-        new_smb_pwent.smb_passwd = new_p16;
-        new_smb_pwent.smb_nt_passwd = new_nt_p16;
-      }
-
-      if(add_smbpwd_entry(&new_smb_pwent) == False) {
-        fprintf(stderr, "%s: Failed to add entry for user %s.\n", 
-                prog_name, pwd->pw_name);
-        endsmbpwent(vp);
-        exit(1);
-      }
-      
-      endsmbpwent(vp);
-      printf("%s: Added user %s.\n", prog_name, user_name);
-      exit(0);
-    }
-  } else {
-         /* the entry already existed */
-         add_user = False;
-  }
-
-  /*
-   * We are root - just write the new password
-   * and the valid last change time.
-   */
-
-  if(disable_user) {
-    /*
-     * This currently won't work as it means changing
-     * the length of the record. JRA.
-     */
-    smb_pwent->acct_ctrl |= ACB_DISABLED;
-    smb_pwent->smb_passwd = NULL;
-    smb_pwent->smb_nt_passwd = NULL;
-  } else if (set_no_password) {
-    /*
-     * This currently won't work as it means changing
-     * the length of the record. JRA.
-     */
-    smb_pwent->acct_ctrl |= ACB_PWNOTREQ;
-    smb_pwent->smb_passwd = NULL;
-    smb_pwent->smb_nt_passwd = NULL; 
-  } else {
-    smb_pwent->smb_passwd = new_p16;
-    smb_pwent->smb_nt_passwd = new_nt_p16;
-  }
-
-  if(mod_smbpwd_entry(smb_pwent,True) == False) {
-    fprintf(stderr, "%s: Failed to modify entry for user %s.\n",
-            prog_name, pwd->pw_name);
-    endsmbpwent(vp);
-    exit(1);
-  }
-
-  endsmbpwent(vp);
-  if(disable_user)
-    printf("User %s disabled.\n", user_name);
-  else if (set_no_password)
-    printf("User %s - set to no password.\n", user_name);
-  else
-    printf("Password changed for user %s.\n", user_name);
-  return 0;
+       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;
+}
+
+
+/*************************************************************
+ Handle password changing for root.
+*************************************************************/
+
+static int process_root(int argc, char *argv[])
+{
+       struct passwd  *pwd;
+       int result = 0, ch;
+       BOOL joining_domain = False, got_pass = False, got_username = False;
+       int local_flags = LOCAL_SET_PASSWORD;
+       BOOL stdin_passwd_get = False;
+       fstring user_name, user_password;
+       char *new_domain = NULL;
+       char *new_passwd = NULL;
+       char *old_passwd = NULL;
+       char *remote_machine = NULL;
+
+       ZERO_STRUCT(user_name);
+       ZERO_STRUCT(user_password);
+
+       user_name[0] = '\0';
+
+       while ((ch = getopt(argc, argv, "axdehmnj:r:sR:D:U:L")) != EOF) {
+               switch(ch) {
+               case 'L':
+                       local_mode = True;
+                       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 'n':
+                       local_flags |= LOCAL_SET_NO_PASSWORD;
+                       local_flags &= ~LOCAL_SET_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': {
+                       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 'h':
+               default:
+                       usage();
+               }
+       }
+       
+       argc -= optind;
+       argv += optind;
+
+       /*
+        * Ensure both add/delete user are not set
+        * Ensure add/delete user and either remote machine or join domain are
+        * not both set.
+        */     
+       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))) {
+               usage();
+       }
+       
+       /* Only load interfaces if we are doing network operations. */
+
+       if (joining_domain || remote_machine) {
+               load_interfaces();
+       }
+
+       /* Join a domain */
+
+       if (joining_domain) {
+
+               if (argc != 0)
+                       usage();
+
+               /* Are we joining by specifing an admin username and
+                  password? */
+
+               if (user_name[0]) {
+
+                       /* Get administrator password if not specified */
+
+                       if (!got_pass) {
+                               char *pass = getpass("Password: ");
+
+                               if (pass)
+                                       pstrcpy(user_password, pass);
+                       }
+                               
+                       return join_domain_byuser(new_domain, remote_machine,
+                                                 user_name, user_password);
+               } else {
+
+                       /* Or just with the server manager? */
+
+                       return join_domain(new_domain, remote_machine);
+               }
+       }
+
+       /*
+        * 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 = xstrdup(argv[1]);
+               break;
+       default:
+               usage();
+       }
+
+       if (!user_name[0] && (pwd = sys_getpwuid(geteuid()))) {
+               fstrcpy(user_name, pwd->pw_name);
+       } 
+
+       if (!user_name[0]) {
+               fprintf(stderr,"You must specify a username\n");
+               exit(1);
+       }
+
+       if (local_flags & LOCAL_TRUST_ACCOUNT) {
+               /* add the $ automatically */
+               static fstring buf;
+
+               /*
+                * Remove any trailing '$' before we
+                * generate the initial machine password.
+                */
+
+               if (user_name[strlen(user_name)-1] == '$') {
+                       user_name[strlen(user_name)-1] = 0;
+               }
+
+               if (local_flags & LOCAL_ADD_USER) {
+                       SAFE_FREE(new_passwd);
+                       new_passwd = xstrdup(user_name);
+                       strlower(new_passwd);
+               }
+
+               /*
+                * Now ensure the username ends in '$' for
+                * the machine add.
+                */
+
+               slprintf(buf, sizeof(buf)-1, "%s$", user_name);
+               fstrcpy(user_name, buf);
+       }
+
+       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.
+                */
+
+               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);
+               }
+       }
+
+       if(local_flags & LOCAL_SET_PASSWORD) {
+               new_passwd = prompt_for_new_password(stdin_passwd_get);
+               
+               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|LOCAL_SET_PASSWORD))) {
+               SAM_ACCOUNT *sampass = NULL;
+               BOOL ret;
+               
+               pdb_init_sam(&sampass);
+               ret = pdb_getsampwnam(sampass, user_name);
+
+               printf("Password changed for user %s.", user_name );
+               if( (ret != False) && (pdb_get_acct_ctrl(sampass)&ACB_DISABLED) )
+                       printf(" User has disabled flag set.");
+               if((ret != False) && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) )
+                       printf(" User has no password flag set.");
+               printf("\n");
+               pdb_free_sam(&sampass);
+       }
+
+ done:
+       SAFE_FREE(new_passwd);
+       return result;
+}
+
+
+/*************************************************************
+handle password changing for non-root
+*************************************************************/
+static int process_nonroot(int argc, char *argv[])
+{
+       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;
+
+       if(argc > 1) {
+               usage();
+       }
+       
+       if (argc == 1) {
+               new_passwd = argv[0];
+       }
+       
+       if (!user_name) {
+               pwd = sys_getpwuid(getuid());
+               if (pwd) {
+                       user_name = xstrdup(pwd->pw_name);
+               } else {
+                       fprintf(stderr,"you don't exist - go away\n");
+                       exit(1);
+               }
+       }
+       
+       /*
+        * A non-root user is always setting a password
+        * via a remote machine (even if that machine is
+        * localhost).
+        */     
+
+       load_interfaces(); /* Delayed from main() */
+
+       if (remote_machine == NULL) {
+               remote_machine = "127.0.0.1";
+       }
+
+       if (remote_machine != NULL) {
+               old_passwd = get_pass("Old SMB password:",stdin_passwd_get);
+       }
+       
+       if (!new_passwd) {
+               new_passwd = prompt_for_new_password(stdin_passwd_get);
+       }
+       
+       if (!new_passwd) {
+               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);
+               result = 1;
+               goto done;
+       }
+
+       printf("Password changed for user %s\n", user_name);
+
+ done:
+       SAFE_FREE(old_passwd);
+       SAFE_FREE(new_passwd);
+
+       return result;
+}
+
+
+
+/*********************************************************
+ Start here.
+**********************************************************/
+int main(int argc, char **argv)
+{      
+#if defined(HAVE_SET_AUTH_PARAMETERS)
+       set_auth_parameters(argc, argv);
+#endif /* HAVE_SET_AUTH_PARAMETERS */
+
+       TimeInit();
+       
+       setup_logging("smbpasswd", True);
+       
+       if(!initialize_password_db(True)) {
+               fprintf(stderr, "Can't setup password database vectors.\n");
+               exit(1);
+       }
+
+       if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+               fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
+                       dyn_CONFIGFILE);
+               exit(1);
+       }
+
+       /*
+        * 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);
+
+       /* Check the effective uid - make sure we are not setuid */
+       if (is_setuid_root()) {
+               fprintf(stderr, "smbpasswd must *NOT* be setuid root.\n");
+               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) {
+               secrets_init();
+               return process_root(argc, argv);
+       } 
+
+       return process_nonroot(argc, argv);
 }