*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
+ * Free Software Foundation; either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
#include "includes.h"
-extern pstring global_myname;
extern BOOL AllowDebugChange;
/*
extern int optind;
/* forced running in root-mode */
-static BOOL local_mode;
-static BOOL got_pass = False, got_username = False;
-static int local_flags = 0;
+static BOOL got_username = False;
static BOOL stdin_passwd_get = False;
-static fstring user_name, user_password;
-static char *new_domain = NULL;
+static fstring user_name;
static char *new_passwd = NULL;
-static char *old_passwd = NULL;
-static char *remote_machine = NULL;
-static pstring configfile;
+static const char *remote_machine = NULL;
-#ifdef WITH_LDAP_SAM
static fstring ldap_secret;
-#endif
+
/*********************************************************
Print command usage on stderr and die.
static void usage(void)
{
printf("When run by root:\n");
- printf(" smbpasswd [options] [username] [password]\n");
+ printf(" smbpasswd [options] [username]\n");
printf("otherwise:\n");
- printf(" smbpasswd [options] [password]\n\n");
+ printf(" smbpasswd [options]\n\n");
printf("options:\n");
- printf(" -c smb.conf file Use the given path to the smb.conf file\n");
+ printf(" -L local mode (must be first option)\n");
+ printf(" -h print this usage message\n");
printf(" -s use stdin for password prompt\n");
+ printf(" -c smb.conf file Use the given path to the smb.conf file\n");
printf(" -D LEVEL debug level\n");
- printf(" -U USER remote username\n");
printf(" -r MACHINE remote machine\n");
+ printf(" -U USER remote username\n");
printf("extra options when run by root or in local mode:\n");
- printf(" -L local mode (must be first option)\n");
- printf(" -R ORDER name resolve order\n");
printf(" -a add user\n");
- printf(" -x delete user\n");
printf(" -d disable user\n");
printf(" -e enable user\n");
- printf(" -n set no password\n");
- printf(" -m machine trust account\n");
printf(" -i interdomain trust account\n");
-#ifdef WITH_LDAP_SAM
- printf(" -w ldap admin password\n");
-#endif
+ printf(" -m machine trust account\n");
+ printf(" -n set no password\n");
+ printf(" -W use stdin ldap admin password\n");
+ printf(" -w PASSWORD ldap admin password\n");
+ printf(" -x delete user\n");
+ printf(" -R ORDER name resolve order\n");
exit(1);
}
/*******************************************************************
Process command line options
******************************************************************/
-static void process_options(int argc, char **argv, BOOL amroot)
+
+static int process_options(int argc, char **argv, int local_flags)
{
int ch;
+ pstring configfile;
+ pstrcpy(configfile, dyn_CONFIGFILE);
- if (amroot)
- local_flags = LOCAL_SET_PASSWORD;
+ local_flags |= LOCAL_SET_PASSWORD;
ZERO_STRUCT(user_name);
- ZERO_STRUCT(user_password);
user_name[0] = '\0';
- while ((ch = getopt(argc, argv, "c:axdehmnj:r:sw:R:D:U:L")) != EOF) {
+ while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:LW")) != EOF) {
switch(ch) {
case 'L':
- local_mode = amroot = True;
- local_flags = LOCAL_SET_PASSWORD;
+ local_flags |= LOCAL_AM_ROOT;
break;
case 'c':
pstrcpy(configfile,optarg);
break;
case 'a':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_ADD_USER;
break;
case 'x':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_DELETE_USER;
local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'd':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_DISABLE_USER;
local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'e':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_ENABLE_USER;
local_flags &= ~LOCAL_SET_PASSWORD;
break;
case 'm':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_TRUST_ACCOUNT;
break;
case 'i':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_INTERDOM_ACCOUNT;
break;
case 'j':
- if (!amroot) goto bad_args;
- d_printf("See 'net rpc join' for this functionality\n");
+ d_printf("See 'net join' for this functionality\n");
exit(1);
break;
case 'n':
- if (!amroot) goto bad_args;
local_flags |= LOCAL_SET_NO_PASSWORD;
+ local_flags &= ~LOCAL_SET_PASSWORD;
new_passwd = smb_xstrdup("NO PASSWORD");
break;
case 'r':
stdin_passwd_get = True;
break;
case 'w':
- if (!amroot) goto bad_args;
-#ifdef WITH_LDAP_SAM
local_flags |= LOCAL_SET_LDAP_ADMIN_PW;
fstrcpy(ldap_secret, optarg);
break;
-#else
- printf("-w not available unless configured --with-ldap\n");
- goto bad_args;
-#endif
case 'R':
- if (!amroot) goto bad_args;
lp_set_name_resolve_order(optarg);
break;
case 'D':
DEBUGLEVEL = atoi(optarg);
break;
case 'U': {
- char *lp;
-
got_username = True;
fstrcpy(user_name, optarg);
-
- if ((lp = strchr(user_name, '%'))) {
- *lp = 0;
- fstrcpy(user_password, lp + 1);
- got_pass = True;
- memset(strchr_m(optarg, '%') + 1, 'X',
- strlen(user_password));
- }
-
+ break;
+ case 'W':
+ local_flags |= LOCAL_SET_LDAP_ADMIN_PW;
+ *ldap_secret = '\0';
break;
}
case 'h':
default:
-bad_args:
usage();
}
}
fstrcpy(user_name, "");
break;
case 1:
- if (!amroot) {
- new_passwd = argv[0];
- break;
- }
- if (got_username)
+ if (!(local_flags & LOCAL_AM_ROOT)) {
usage();
- fstrcpy(user_name, argv[0]);
- break;
- case 2:
- if (!amroot || got_username || got_pass)
- usage();
- fstrcpy(user_name, argv[0]);
- new_passwd = smb_xstrdup(argv[1]);
+ } else {
+ if (got_username) {
+ usage();
+ } else {
+ fstrcpy(user_name, argv[0]);
+ }
+ }
break;
default:
usage();
}
-}
-
-/*************************************************************
- 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;
- }
+ if (!lp_load(configfile,True,False,False,True)) {
+ fprintf(stderr, "Can't load %s - run testparm to debug it\n",
+ configfile);
+ exit(1);
}
- return(new_passwd);
-}
-
-/*************************************************************
- Utility function to get passwords via tty or stdin
- Used if the '-s' option is set to silently get passwords
- to enable scripting.
-*************************************************************/
-static char *get_pass( char *prompt, BOOL stdin_get)
-{
- char *p;
- if (stdin_get) {
- p = stdin_new_passwd();
- } else {
- p = getpass(prompt);
- }
- return smb_xstrdup(p);
+ return local_flags;
}
/*************************************************************
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 NTSTATUS password_change(const char *remote_mach, char *username,
+ char *old_passwd, char *new_pw,
+ int local_flags)
{
- BOOL ret;
+ NTSTATUS 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;
+ return NT_STATUS_UNSUCCESSFUL;
}
- 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);
+ fprintf(stderr, "%s", 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)
- printf(msg_str);
+ printf("%s", msg_str);
if(*err_str)
- fprintf(stderr, err_str);
+ fprintf(stderr, "%s", err_str);
return ret;
}
-#ifdef WITH_LDAP_SAM
/*******************************************************************
Store the LDAP admin password in secrets.tdb
******************************************************************/
return secrets_store_ldap_pw(lp_ldap_admin_dn(), pw);
}
-#endif
/*************************************************************
Handle password changing for root.
*************************************************************/
-static int process_root(void)
+static int process_root(int local_flags)
{
struct passwd *pwd;
int result = 0;
+ char *old_passwd = NULL;
-#ifdef WITH_LDAP_SAM
- if (local_flags & LOCAL_SET_LDAP_ADMIN_PW)
- {
- printf("Setting stored password for \"%s\" in secrets.tdb\n",
- lp_ldap_admin_dn());
- if (!store_ldap_admin_pw(ldap_secret))
+ if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) {
+ char *ldap_admin_dn = lp_ldap_admin_dn();
+ if ( ! *ldap_admin_dn ) {
+ DEBUG(0,("ERROR: 'ldap admin dn' not defined! Please check your smb.conf\n"));
+ goto done;
+ }
+
+ printf("Setting stored password for \"%s\" in secrets.tdb\n", ldap_admin_dn);
+ if ( ! *ldap_secret ) {
+ new_passwd = prompt_for_new_password(stdin_passwd_get);
+ fstrcpy(ldap_secret, new_passwd);
+ }
+ if (!store_ldap_admin_pw(ldap_secret)) {
DEBUG(0,("ERROR: Failed to store the ldap admin password!\n"));
+ }
goto done;
}
-#endif
+
+ /* Ensure passdb startup(). */
+ if(!initialize_password_db(False, NULL)) {
+ DEBUG(0, ("Failed to open passdb!\n"));
+ exit(1);
+ }
+
+ /* Ensure we have a SAM sid. */
+ get_global_sam_sid();
/*
* Ensure both add/delete user are not set
load_interfaces();
}
- if (!user_name[0] && (pwd = sys_getpwuid(geteuid()))) {
+ if (!user_name[0] && (pwd = getpwuid_alloc(NULL, geteuid()))) {
fstrcpy(user_name, pwd->pw_name);
+ TALLOC_FREE(pwd);
}
if (!user_name[0]) {
if (local_flags & LOCAL_ADD_USER) {
SAFE_FREE(new_passwd);
new_passwd = smb_xstrdup(user_name);
- strlower(new_passwd);
+ strlower_m(new_passwd);
}
/*
} else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
static fstring buf;
- if (local_flags & LOCAL_ADD_USER) {
+ if ((local_flags & LOCAL_ADD_USER) && (new_passwd == NULL)) {
/*
* Prompt for trusting domain's account password
*/
exit(1);
}
}
+
+ /* prepare uppercased and '$' terminated username */
slprintf(buf, sizeof(buf) - 1, "%s$", user_name);
fstrcpy(user_name, buf);
-
+
} else {
if (remote_machine != NULL) {
*/
if(local_flags & LOCAL_ENABLE_USER) {
- SAM_ACCOUNT *sampass = NULL;
- BOOL ret;
+ struct samu *sampass = NULL;
- pdb_init_sam(&sampass);
- ret = pdb_getsampwnam(sampass, user_name);
- if((sampass != False) && (pdb_get_lanman_passwd(sampass) == NULL)) {
+ sampass = samu_new( NULL );
+ if (!sampass) {
+ fprintf(stderr, "talloc fail for struct samu.\n");
+ exit(1);
+ }
+ if (!pdb_getsampwnam(sampass, user_name)) {
+ fprintf(stderr, "Failed to find user %s in passdb backend.\n",
+ user_name );
+ exit(1);
+ }
+
+ if(pdb_get_nt_passwd(sampass) == NULL) {
local_flags |= LOCAL_SET_PASSWORD;
}
- pdb_free_sam(&sampass);
+ TALLOC_FREE(sampass);
}
}
- if(local_flags & LOCAL_SET_PASSWORD) {
+ if((local_flags & LOCAL_SET_PASSWORD) && (new_passwd == NULL)) {
new_passwd = prompt_for_new_password(stdin_passwd_get);
if(!new_passwd) {
}
}
- if (!password_change(remote_machine, user_name, old_passwd, new_passwd, local_flags)) {
+ if (!NT_STATUS_IS_OK(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(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;
+ struct samu *sampass = NULL;
- pdb_init_sam(&sampass);
- ret = pdb_getsampwnam(sampass, user_name);
+ sampass = samu_new( NULL );
+ if (!sampass) {
+ fprintf(stderr, "talloc fail for struct samu.\n");
+ exit(1);
+ }
+
+ if (!pdb_getsampwnam(sampass, user_name)) {
+ fprintf(stderr, "Failed to find user %s in passdb backend.\n",
+ user_name );
+ exit(1);
+ }
printf("Password changed for user %s.", user_name );
- if( (ret != False) && (pdb_get_acct_ctrl(sampass)&ACB_DISABLED) )
+ if(pdb_get_acct_ctrl(sampass)&ACB_DISABLED) {
printf(" User has disabled flag set.");
- if((ret != False) && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) )
+ }
+ if(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ) {
printf(" User has no password flag set.");
+ }
printf("\n");
- pdb_free_sam(&sampass);
+ TALLOC_FREE(sampass);
}
done:
Handle password changing for non-root.
*************************************************************/
-static int process_nonroot(void)
+static int process_nonroot(int local_flags)
{
struct passwd *pwd = NULL;
int result = 0;
+ char *old_pw = NULL;
+ char *new_pw = NULL;
+
+ if (local_flags & ~(LOCAL_AM_ROOT | LOCAL_SET_PASSWORD)) {
+ /* Extra flags that we can't honor non-root */
+ usage();
+ }
if (!user_name[0]) {
- pwd = sys_getpwuid(getuid());
+ pwd = getpwuid_alloc(NULL, getuid());
if (pwd) {
fstrcpy(user_name,pwd->pw_name);
+ TALLOC_FREE(pwd);
} else {
- fprintf(stderr, "smbpasswd: you don't exist - go away\n");
+ fprintf(stderr, "smbpasswd: cannot lookup user name for uid %u\n", (unsigned int)getuid());
exit(1);
}
}
}
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 (!NT_STATUS_IS_OK(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)
{
- BOOL amroot = getuid() == 0;
-
- pstrcpy(configfile, dyn_CONFIGFILE);
+ int local_flags = 0;
+
AllowDebugChange = False;
#if defined(HAVE_SET_AUTH_PARAMETERS)
set_auth_parameters(argc, argv);
#endif /* HAVE_SET_AUTH_PARAMETERS */
- process_options(argc, argv, amroot);
+ if (getuid() == 0) {
+ local_flags = LOCAL_AM_ROOT;
+ }
+
+ load_case_tables();
+
+ local_flags = process_options(argc, argv, local_flags);
setup_logging("smbpasswd", True);
- if (!lp_load(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);
+ if (!init_names())
+ return 1;
/* Check the effective uid - make sure we are not setuid */
if (is_setuid_root()) {
exit(1);
}
- if (local_mode || amroot) {
+ if (local_flags & LOCAL_AM_ROOT) {
secrets_init();
- return process_root();
+ return process_root(local_flags);
}
- return process_nonroot();
+ return process_nonroot(local_flags);
}
git.samba.org / amitay / samba.git / blobdiff