X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Futils%2Fsmbpasswd.c;h=40131205265b57707ceb1fc25e97f38d848f1073;hb=ceaa3ead1520118496d7a9e7d64610f3db4df2b8;hp=d66001e441b2d583d40b148e63c222b3ae3728a2;hpb=cd559192633d78a9f06e239c6a448955f6ea0842;p=bbaumbach%2Fsamba-autobuild%2F.git diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index d66001e441b..40131205265 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -5,7 +5,7 @@ * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your + * Free Software Foundation; either version 3 of the License, or (at your * option) any later version. * * This program is distributed in the hope that it will be useful, but WITHOUT @@ -14,12 +14,17 @@ * more details. * * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 675 - * Mass Ave, Cambridge, MA 02139, USA. */ + * this program; if not, see . */ #include "includes.h" - -extern BOOL AllowDebugChange; +#include "system/passwd.h" +#include "secrets.h" +#include "../librpc/gen_ndr/samr.h" +#include "../lib/util/util_pw.h" +#include "libsmb/proto.h" +#include "passdb.h" +#include "cmdline_contexts.h" +#include "passwd_proto.h" /* * Next two lines needed for SunOS and don't @@ -29,8 +34,8 @@ extern char *optarg; extern int optind; /* forced running in root-mode */ -static BOOL got_username = False; -static BOOL stdin_passwd_get = False; +static bool got_username = False; +static bool stdin_passwd_get = False; static fstring user_name; static char *new_passwd = NULL; static const char *remote_machine = NULL; @@ -55,7 +60,7 @@ static void usage(void) printf(" -c smb.conf file Use the given path to the smb.conf file\n"); printf(" -D LEVEL debug level\n"); printf(" -r MACHINE remote machine\n"); - printf(" -U USER remote username\n"); + printf(" -U USER remote username (e.g. SAM/user)\n"); printf("extra options when run by root or in local mode:\n"); printf(" -a add user\n"); @@ -64,6 +69,7 @@ static void usage(void) printf(" -i interdomain trust account\n"); 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"); @@ -83,8 +89,7 @@ static void set_line_buffering(FILE *f) static int process_options(int argc, char **argv, int local_flags) { int ch; - pstring configfile; - pstrcpy(configfile, dyn_CONFIGFILE); + const char *configfile = get_dyn_CONFIGFILE(); local_flags |= LOCAL_SET_PASSWORD; @@ -92,13 +97,18 @@ static int process_options(int argc, char **argv, int local_flags) user_name[0] = '\0'; - while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:LW")) != EOF) { + while ((ch = getopt(argc, argv, "c:axdehminjr:sw:R:D:U:LWS:")) != EOF) { switch(ch) { case 'L': + if (getuid() != 0) { + fprintf(stderr, "smbpasswd -L can only be used by root.\n"); + exit(1); + } local_flags |= LOCAL_AM_ROOT; break; case 'c': - pstrcpy(configfile,optarg); + configfile = optarg; + set_dyn_CONFIGFILE(optarg); break; case 'a': local_flags |= LOCAL_ADD_USER; @@ -128,6 +138,7 @@ static int process_options(int argc, char **argv, int local_flags) case 'n': local_flags |= LOCAL_SET_NO_PASSWORD; local_flags &= ~LOCAL_SET_PASSWORD; + SAFE_FREE(new_passwd); new_passwd = smb_xstrdup("NO PASSWORD"); break; case 'r': @@ -144,10 +155,10 @@ static int process_options(int argc, char **argv, int local_flags) fstrcpy(ldap_secret, optarg); break; case 'R': - lp_set_name_resolve_order(optarg); + lp_set_cmdline("name resolve order", optarg); break; case 'D': - DEBUGLEVEL = atoi(optarg); + lp_set_cmdline("log level", optarg); break; case 'U': { got_username = True; @@ -163,7 +174,7 @@ static int process_options(int argc, char **argv, int local_flags) usage(); } } - + argc -= optind; argv += optind; @@ -187,9 +198,9 @@ static int process_options(int argc, char **argv, int local_flags) usage(); } - if (!lp_load(configfile,True,False,False,True)) { + if (!lp_load_global(configfile)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", - dyn_CONFIGFILE); + configfile); exit(1); } @@ -199,19 +210,25 @@ static int process_options(int argc, char **argv, int local_flags) /************************************************************* Utility function to prompt for new password. *************************************************************/ -static char *prompt_for_new_password(BOOL stdin_get) +static char *prompt_for_new_password(bool stdin_get) { char *p; fstring new_pw; ZERO_ARRAY(new_pw); - + p = get_pass("New SMB password:", stdin_get); + if (p == NULL) { + return NULL; + } fstrcpy(new_pw, p); SAFE_FREE(p); p = get_pass("Retype new SMB password:", stdin_get); + if (p == NULL) { + return NULL; + } if (strcmp(p, new_pw)) { fprintf(stderr, "Mismatch - password unchanged.\n"); @@ -228,49 +245,57 @@ static char *prompt_for_new_password(BOOL stdin_get) Change a password either locally or remotely. *************************************************************/ -static NTSTATUS password_change(const char *remote_mach, char *username, - char *old_passwd, char *new_pw, +static NTSTATUS password_change(const char *remote_mach, + const char *domain, const char *username, + const char *old_passwd, const char *new_pw, int local_flags) { NTSTATUS ret; - pstring err_str; - pstring msg_str; + char *err_str = NULL; + char *msg_str = NULL; if (remote_mach != NULL) { - if (local_flags & (LOCAL_ADD_USER|LOCAL_DELETE_USER|LOCAL_DISABLE_USER|LOCAL_ENABLE_USER| - LOCAL_TRUST_ACCOUNT|LOCAL_SET_NO_PASSWORD)) { + if (local_flags & (LOCAL_ADD_USER|LOCAL_DELETE_USER| + LOCAL_DISABLE_USER|LOCAL_ENABLE_USER| + LOCAL_TRUST_ACCOUNT|LOCAL_SET_NO_PASSWORD)) { /* these things can't be done remotely yet */ + fprintf(stderr, "Invalid remote operation!\n"); return NT_STATUS_UNSUCCESSFUL; } - ret = remote_password_change(remote_mach, username, - old_passwd, new_pw, err_str, sizeof(err_str)); - if(*err_str) - fprintf(stderr, "%s", err_str); - return ret; + ret = remote_password_change(remote_mach, + domain, username, + old_passwd, new_pw, &err_str); + } else { + ret = local_password_change(username, local_flags, new_pw, + &err_str, &msg_str); } - - ret = local_password_change(username, local_flags, new_pw, - err_str, sizeof(err_str), msg_str, sizeof(msg_str)); - if(*msg_str) + if (msg_str) { printf("%s", msg_str); - if(*err_str) + } + if (err_str) { fprintf(stderr, "%s", err_str); + } + if (!NT_STATUS_IS_OK(ret) && !err_str) { + fprintf(stderr, "Failed to change password!\n"); + } + SAFE_FREE(msg_str); + SAFE_FREE(err_str); return ret; } /******************************************************************* Store the LDAP admin password in secrets.tdb ******************************************************************/ -static BOOL store_ldap_admin_pw (char* pw) +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); } @@ -286,7 +311,7 @@ static int process_root(int local_flags) char *old_passwd = NULL; if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) { - char *ldap_admin_dn = lp_ldap_admin_dn(); + const 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; @@ -295,6 +320,10 @@ static int process_root(int local_flags) 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); + if (new_passwd == NULL) { + fprintf(stderr, "Failed to read new password!\n"); + exit(1); + } fstrcpy(ldap_secret, new_passwd); } if (!store_ldap_admin_pw(ldap_secret)) { @@ -304,11 +333,11 @@ static int process_root(int local_flags) } /* Ensure passdb startup(). */ - if(!initialize_password_db(False)) { + 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(); @@ -322,14 +351,14 @@ static int process_root(int local_flags) (remote_machine != NULL))) { usage(); } - + /* Only load interfaces if we are doing network operations. */ if (remote_machine) { load_interfaces(); } - if (!user_name[0] && (pwd = getpwuid_alloc(NULL, geteuid()))) { + if (!user_name[0] && (pwd = getpwuid_alloc(talloc_tos(), geteuid()))) { fstrcpy(user_name, pwd->pw_name); TALLOC_FREE(pwd); } @@ -341,32 +370,44 @@ static int process_root(int local_flags) if (local_flags & LOCAL_TRUST_ACCOUNT) { /* add the $ automatically */ - static fstring buf; + size_t user_name_len = strlen(user_name); - /* - * 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 (user_name[user_name_len - 1] == '$') { + user_name_len--; + } else { + if (user_name_len + 2 > sizeof(user_name)) { + fprintf(stderr, "machine name too long\n"); + exit(1); + } + user_name[user_name_len] = '$'; + user_name[user_name_len + 1] = '\0'; } if (local_flags & LOCAL_ADD_USER) { SAFE_FREE(new_passwd); - new_passwd = smb_xstrdup(user_name); - strlower_m(new_passwd); - } - /* - * Now ensure the username ends in '$' for - * the machine add. - */ - - slprintf(buf, sizeof(buf)-1, "%s$", user_name); - fstrcpy(user_name, buf); + /* + * Remove any trailing '$' before we + * generate the initial machine password. + */ + new_passwd = smb_xstrndup(user_name, user_name_len); + if (!strlower_m(new_passwd)) { + fprintf(stderr, "strlower_m %s failed\n", + new_passwd); + exit(1); + } + } } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) { - static fstring buf; + size_t user_name_len = strlen(user_name); + + if (user_name[user_name_len - 1] != '$') { + if (user_name_len + 2 > sizeof(user_name)) { + fprintf(stderr, "machine name too long\n"); + exit(1); + } + user_name[user_name_len] = '$'; + user_name[user_name_len + 1] = '\0'; + } if ((local_flags & LOCAL_ADD_USER) && (new_passwd == NULL)) { /* @@ -378,19 +419,18 @@ static int process_root(int local_flags) exit(1); } } - - /* prepare uppercased and '$' terminated username */ - slprintf(buf, sizeof(buf) - 1, "%s$", user_name); - fstrcpy(user_name, buf); - } else { - + if (remote_machine != NULL) { old_passwd = get_pass("Old SMB password:",stdin_passwd_get); + if(!old_passwd) { + fprintf(stderr, "Unable to get old password.\n"); + exit(1); + } } - + if (!(local_flags & LOCAL_SET_PASSWORD)) { - + /* * If we are trying to enable a user, first we need to find out * if they are using a modern version of the smbpasswd file that @@ -399,24 +439,31 @@ static int process_root(int local_flags) * 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) { struct samu *sampass = NULL; - BOOL ret; - + sampass = samu_new( NULL ); - ret = pdb_getsampwnam(sampass, user_name); - if((ret) && - (pdb_get_lanman_passwd(sampass) == 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; } TALLOC_FREE(sampass); } } - + 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); @@ -424,10 +471,10 @@ static int process_root(int local_flags) } } - if (!NT_STATUS_IS_OK(password_change(remote_machine, user_name, + if (!NT_STATUS_IS_OK(password_change(remote_machine, + NULL, 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; } @@ -436,21 +483,32 @@ static int process_root(int local_flags) 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))) { struct samu *sampass = NULL; - BOOL ret; - + sampass = samu_new( NULL ); - ret = pdb_getsampwnam(sampass, user_name); + 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"); TALLOC_FREE(sampass); } done: + SAFE_FREE(old_passwd); SAFE_FREE(new_passwd); return result; } @@ -466,6 +524,9 @@ static int process_nonroot(int local_flags) int result = 0; char *old_pw = NULL; char *new_pw = NULL; + const char *username = user_name; + const char *domain = NULL; + char *p = NULL; if (local_flags & ~(LOCAL_AM_ROOT | LOCAL_SET_PASSWORD)) { /* Extra flags that we can't honor non-root */ @@ -473,7 +534,7 @@ static int process_nonroot(int local_flags) } if (!user_name[0]) { - pwd = getpwuid_alloc(NULL, getuid()); + pwd = getpwuid_alloc(talloc_tos(), getuid()); if (pwd) { fstrcpy(user_name,pwd->pw_name); TALLOC_FREE(pwd); @@ -482,7 +543,16 @@ static int process_nonroot(int local_flags) exit(1); } } - + + /* Allow domain as part of the username */ + if ((p = strchr_m(user_name, '\\')) || + (p = strchr_m(user_name, '/')) || + (p = strchr_m(user_name, *lp_winbind_separator()))) { + *p = '\0'; + username = p + 1; + domain = user_name; + } + /* * A non-root user is always setting a password * via a remote machine (even if that machine is @@ -491,33 +561,45 @@ static int process_nonroot(int local_flags) load_interfaces(); /* Delayed from main() */ - if (remote_machine == NULL) { + if (remote_machine != NULL) { + if (!is_ipaddress(remote_machine)) { + domain = remote_machine; + } + } else { remote_machine = "127.0.0.1"; + + /* + * If we deal with a local user, change the password for the + * user in our SAM. + */ + domain = get_global_sam_name(); } - if (remote_machine != NULL) { - old_pw = get_pass("Old SMB password:",stdin_passwd_get); + old_pw = get_pass("Old SMB password:",stdin_passwd_get); + if (old_pw == NULL) { + fprintf(stderr, "Unable to get old password.\n"); + exit(1); } - + if (!new_passwd) { new_pw = prompt_for_new_password(stdin_passwd_get); } else new_pw = smb_xstrdup(new_passwd); - + if (!new_pw) { fprintf(stderr, "Unable to get new password.\n"); exit(1); } - 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); + if (!NT_STATUS_IS_OK(password_change(remote_machine, + domain, username, + old_pw, new_pw, 0))) { result = 1; goto done; } - printf("Password changed for user %s\n", user_name); + printf("Password changed for user %s\n", username); done: SAFE_FREE(old_pw); @@ -533,9 +615,9 @@ static int process_nonroot(int local_flags) **********************************************************/ int main(int argc, char **argv) { + TALLOC_CTX *frame = talloc_stackframe(); int local_flags = 0; - - AllowDebugChange = False; + int ret; #if defined(HAVE_SET_AUTH_PARAMETERS) set_auth_parameters(argc, argv); @@ -545,17 +627,17 @@ int main(int argc, char **argv) local_flags = LOCAL_AM_ROOT; } - load_case_tables(); + smb_init_locale(); local_flags = process_options(argc, argv, local_flags); - setup_logging("smbpasswd", True); - + setup_logging("smbpasswd", DEBUG_STDERR); + /* * Set the machine NETBIOS name if not already * set from the config file. */ - + if (!init_names()) return 1; @@ -566,9 +648,16 @@ int main(int argc, char **argv) } if (local_flags & LOCAL_AM_ROOT) { - secrets_init(); - return process_root(local_flags); - } + bool ok; - return process_nonroot(local_flags); + ok = secrets_init(); + if (!ok) { + return 1; + } + ret = process_root(local_flags); + } else { + ret = process_nonroot(local_flags); + } + TALLOC_FREE(frame); + return ret; }