/*
- * 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 global_myname;
-extern int DEBUGLEVEL;
/*
* Next two lines needed for SunOS and don't
extern char *optarg;
extern int optind;
-/* forced running in root-mode */
+/** forced running in root-mode **/
static BOOL local_mode;
-/*********************************************************
-a strdup with exit
-**********************************************************/
-static char *xstrdup(char *s)
-{
- s = strdup(s);
- if (!s) {
- fprintf(stderr,"out of memory\n");
- exit(1);
- }
- return s;
-}
-
-
-/*********************************************************
- Print command usage on stderr and die.
-**********************************************************/
+/**
+ * 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(" -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");
- 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");
- }
+ 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);
}
return (int)ret;
}
+/* Initialise client credentials for authenticated pipe access */
+
+void init_rpcclient_creds(struct ntuser_creds *creds, char* username,
+ char* domain, char* password)
+{
+ 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);
+}
+
+/*********************************************************
+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)
+{
+ /* 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)
{
p = get_pass("New SMB password:", stdin_get);
fstrcpy(new_passwd, p);
- safe_free(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);
+ SAFE_FREE(p);
return NULL;
}
return False;
}
ret = remote_password_change(remote_machine, user_name,
- old_passwd, new_passwd, err_str, sizeof(err_str));
+ old_passwd, new_passwd, err_str, sizeof(err_str));
if(*err_str)
fprintf(stderr, err_str);
return ret;
{
struct passwd *pwd;
int result = 0, ch;
- BOOL joining_domain = False;
- int local_flags = 0;
+ BOOL joining_domain = False, got_pass = False, got_username = False;
+ int local_flags = LOCAL_SET_PASSWORD;
BOOL stdin_passwd_get = False;
- char *user_name = NULL;
+ fstring user_name, user_password;
char *new_domain = NULL;
char *new_passwd = NULL;
char *old_passwd = NULL;
char *remote_machine = NULL;
- while ((ch = getopt(argc, argv, "ax:d:e:mnj:r:sR:D:U:L")) != EOF) {
+ 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 'x':
local_flags |= LOCAL_DELETE_USER;
- user_name = optarg;
- new_passwd = xstrdup("XXXXXX");
+ local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'd':
local_flags |= LOCAL_DISABLE_USER;
- user_name = optarg;
- new_passwd = xstrdup("XXXXXX");
+ local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'e':
local_flags |= LOCAL_ENABLE_USER;
- user_name = optarg;
+ local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'm':
local_flags |= LOCAL_TRUST_ACCOUNT;
break;
case 'n':
local_flags |= LOCAL_SET_NO_PASSWORD;
- new_passwd = xstrdup("NO PASSWORD");
+ local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'j':
new_domain = optarg;
case 'D':
DEBUGLEVEL = atoi(optarg);
break;
- case 'U':
- user_name = optarg;
+ 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();
}
load_interfaces();
}
- if(joining_domain) {
+ /* Join a domain */
+
+ if (joining_domain) {
+
if (argc != 0)
usage();
- return join_domain(new_domain, remote_machine);
+
+ /* 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);
+ }
}
/*
switch(argc) {
case 0:
+ if (!got_username)
+ fstrcpy(user_name, "");
break;
case 1:
- user_name = argv[0];
+ if (got_username)
+ usage();
+ fstrcpy(user_name, argv[0]);
break;
case 2:
- user_name = argv[0];
+ if (got_username || got_pass)
+ usage();
+ fstrcpy(user_name, argv[0]);
new_passwd = xstrdup(argv[1]);
break;
default:
usage();
}
- if (!user_name && (pwd = sys_getpwuid(0))) {
- user_name = xstrdup(pwd->pw_name);
+ if (!user_name[0] && (pwd = sys_getpwuid(geteuid()))) {
+ fstrcpy(user_name, pwd->pw_name);
}
- if (!user_name) {
+ if (!user_name[0]) {
fprintf(stderr,"You must specify a username\n");
exit(1);
}
}
if (local_flags & LOCAL_ADD_USER) {
- safe_free(new_passwd);
+ SAFE_FREE(new_passwd);
new_passwd = xstrdup(user_name);
strlower(new_passwd);
}
*/
slprintf(buf, sizeof(buf)-1, "%s$", user_name);
- user_name = buf;
+ fstrcpy(user_name, buf);
}
if (remote_machine != NULL) {
old_passwd = get_pass("Old SMB password:",stdin_passwd_get);
}
- if (!new_passwd) {
+ if (!(local_flags & LOCAL_SET_PASSWORD)) {
/*
* If we are trying to enable a user, first we need to find out
pdb_init_sam(&sampass);
ret = pdb_getsampwnam(sampass, user_name);
- if((sampass != False) && (pdb_get_lanman_passwd(sampass) != NULL)) {
- new_passwd = xstrdup("XXXX"); /* Don't care. */
+ if((sampass != False) && (pdb_get_lanman_passwd(sampass) == NULL)) {
+ local_flags |= LOCAL_SET_PASSWORD;
}
- pdb_free_sam(sampass);
+ pdb_free_sam(&sampass);
}
+ }
- if(!new_passwd)
- new_passwd = prompt_for_new_password(stdin_passwd_get);
-
+ 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);
goto done;
}
- if(!(local_flags & (LOCAL_ADD_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER|LOCAL_DELETE_USER|LOCAL_SET_NO_PASSWORD))) {
+ 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;
if((ret != False) && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) )
printf(" User has no password flag set.");
printf("\n");
- pdb_free_sam(sampass);
+ pdb_free_sam(&sampass);
}
done:
- safe_free(new_passwd);
+ SAFE_FREE(new_passwd);
return result;
}
printf("Password changed for user %s\n", user_name);
done:
- safe_free(old_passwd);
- safe_free(new_passwd);
+ SAFE_FREE(old_passwd);
+ SAFE_FREE(new_passwd);
return result;
}
**********************************************************/
int main(int argc, char **argv)
{
- static pstring servicesf = CONFIGFILE;
-
#if defined(HAVE_SET_AUTH_PARAMETERS)
set_auth_parameters(argc, argv);
#endif /* HAVE_SET_AUTH_PARAMETERS */
setup_logging("smbpasswd", True);
- charset_initialise();
-
if(!initialize_password_db(True)) {
fprintf(stderr, "Can't setup password database vectors.\n");
exit(1);
}
- if (!lp_load(servicesf,True,False,False)) {
+ if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n",
- servicesf);
+ dyn_CONFIGFILE);
exit(1);
}
if (!*global_myname) {
char *p;
fstrcpy(global_myname, myhostname());
- p = strchr(global_myname, '.' );
+ p = strchr_m(global_myname, '.' );
if (p) *p = 0;
}
strupper(global_myname);
- codepage_initialise(lp_client_code_page());
-
- secrets_init();
-
/* Check the effective uid - make sure we are not setuid */
- if ((geteuid() == (uid_t)0) && (getuid() != (uid_t)0)) {
+ if (is_setuid_root()) {
fprintf(stderr, "smbpasswd must *NOT* be setuid root.\n");
exit(1);
}
}
if (local_mode || getuid() == 0) {
+ secrets_init();
return process_root(argc, argv);
}
git.samba.org / ira / wip.git / blobdiff