/*
- * Unix SMB/Netbios implementation.
- * Version 1.9.
- * smbpasswd module.
+ * Unix SMB/CIFS implementation.
* Copyright (C) Jeremy Allison 1995-1998
* Copyright (C) Tim Potter 2001
*
#include "includes.h"
-extern pstring global_myname;
+extern BOOL AllowDebugChange;
/*
* Next two lines needed for SunOS and don't
extern int optind;
/* forced running in root-mode */
-static BOOL local_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 )
+{
+ return;
+}
+
+void unbecome_root( void )
+{
+ return;
+}
+
/*********************************************************
Print command usage on stderr and die.
**********************************************************/
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");
- if (getuid() == 0 || local_mode) {
- 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;
- }
+ 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");
- 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;
+ exit(1);
}
-/* Initialise client credentials for authenticated pipe access */
-
-void init_rpcclient_creds(struct ntuser_creds *creds, char* username,
- char* domain, char* password)
+static void set_line_buffering(FILE *f)
{
- 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);
+ setvbuf(f, NULL, _IOLBF, 0);
}
-/*********************************************************
-Join a domain using the administrator username and password
-**********************************************************/
-
-/* 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; \
- }
-
-#define CHECK_RPC_ERR_DEBUG(rpc, debug_args) \
- if (!NT_STATUS_IS_OK(result = rpc)) { \
- DEBUG(0, debug_args); \
- goto done; \
- }
-
-static int join_domain_byuser(char *domain, char *remote_machine,
- char *username, char *password)
+/*******************************************************************
+ Process command line options
+ ******************************************************************/
+static int process_options(int argc, char **argv, int local_flags)
{
- /* 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;
+ int ch;
+ pstring configfile;
+ pstrcpy(configfile, dyn_CONFIGFILE);
- /* 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;
- }
+ local_flags |= LOCAL_SET_PASSWORD;
- 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");
+ ZERO_STRUCT(user_name);
+ ZERO_STRUCT(user_password);
- CHECK_RPC_ERR(cli_lsa_query_info_policy(&cli, mem_ctx, &lsa_pol,
- 5, domain, &domain_sid),
- "error querying info policy");
+ user_name[0] = '\0';
- cli_lsa_close(&cli, mem_ctx, &lsa_pol);
+ 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;
- cli_nt_session_close(&cli); /* Done with this pipe */
+ got_username = True;
+ fstrcpy(user_name, optarg);
- /* Create domain user */
+ if ((lp = strchr(user_name, '%'))) {
+ *lp = 0;
+ fstrcpy(user_password, lp + 1);
+ got_pass = True;
+ memset(strchr_m(optarg, '%') + 1, 'X',
+ strlen(user_password));
+ }
- if (!cli_nt_session_open(&cli, PIPE_SAMR)) {
- DEBUG(0, ("Error connecting to SAM pipe\n"));
- goto done;
+ break;
+ }
+ case 'h':
+ default:
+ usage();
+ }
}
-
- 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;
- }
+ argc -= optind;
+ argv += optind;
- 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;
+ 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();
}
- 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;
+ fstrcpy(user_name, argv[0]);
+ new_passwd = smb_xstrdup(argv[1]);
+ break;
+ default:
+ usage();
}
- 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);
+ if (!lp_load(configfile,True,False,False)) {
+ fprintf(stderr, "Can't load %s - run testparm to debug it\n",
+ dyn_CONFIGFILE);
+ exit(1);
}
-
- return retval;
-}
-static void set_line_buffering(FILE *f)
-{
- setvbuf(f, NULL, _IOLBF, 0);
+ return local_flags;
}
/*************************************************************
*************************************************************/
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);
}
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) {
} else {
p = getpass(prompt);
}
- return xstrdup(p);
+ return smb_xstrdup(p);
}
/*************************************************************
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);
+ 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);
+ ZERO_ARRAY(new_pw);
SAFE_FREE(p);
return NULL;
}
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)
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, 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;
+ int result = 0;
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();
- }
+ 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
*/
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();
}
- /* 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()))) {
+ if (!user_name[0] && (pwd = getpwuid_alloc(geteuid()))) {
fstrcpy(user_name, pwd->pw_name);
+ passwd_free(&pwd);
}
if (!user_name[0]) {
if (local_flags & LOCAL_ADD_USER) {
SAFE_FREE(new_passwd);
- new_passwd = xstrdup(user_name);
- strlower(new_passwd);
+ new_passwd = smb_xstrdup(user_name);
+ strlower_m(new_passwd);
}
/*
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.
- */
+ } 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)) {
- pdb_init_sam(&sampass);
- ret = pdb_getsampwnam(sampass, user_name);
- if((sampass != False) && (pdb_get_lanman_passwd(sampass) == NULL)) {
- 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);
}
- 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((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 (!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))) {
+ 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;
/*************************************************************
-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;
+ int result = 0;
+ char *old_pw = NULL;
+ char *new_pw = 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) {
+ 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);
}
}
}
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;
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;
}
**********************************************************/
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);
-
- 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_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()) {
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);
+ return process_nonroot(local_flags);
}
git.samba.org / gd / samba-autobuild / .git / blobdiff