mirror of
https://github.com/samba-team/samba.git
synced 2025-02-04 17:47:26 +03:00
some merges from 2.2. Still need to merge in changes from pdb_tdb.c
but it will take more time as I don't want to loose any fixes that are only in HEAD.
This commit is contained in:
Gerald Carter
-
parent
ce7e89949a
commit
efcde5d9d8
@ -603,6 +603,7 @@ typedef struct {
|
||||
(((x)->init_flag & FLAG_SAM_UID) \
|
||||
&& ((x)->init_flag & FLAG_SAM_GID))
|
||||
|
||||
#define IS_SAM_SET(x, flag) ((x)->init_flag & (flag))
|
||||
|
||||
typedef struct sam_passwd
|
||||
{
|
||||
|
||||
@ -155,19 +155,19 @@ BOOL pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, const struct passwd *pwd)
|
||||
|
||||
pstrcpy(str, lp_logon_path());
|
||||
standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
|
||||
pdb_set_profile_path(*new_sam_acct, str);
|
||||
pdb_set_profile_path(*new_sam_acct, str, False);
|
||||
|
||||
pstrcpy(str, lp_logon_home());
|
||||
standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
|
||||
pdb_set_homedir(*new_sam_acct, str);
|
||||
pdb_set_homedir(*new_sam_acct, str, False);
|
||||
|
||||
pstrcpy(str, lp_logon_drive());
|
||||
standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
|
||||
pdb_set_dir_drive(*new_sam_acct, str);
|
||||
pdb_set_dir_drive(*new_sam_acct, str, False);
|
||||
|
||||
pstrcpy(str, lp_logon_script());
|
||||
standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
|
||||
pdb_set_logon_script(*new_sam_acct, str);
|
||||
pdb_set_logon_script(*new_sam_acct, str, False);
|
||||
|
||||
return True;
|
||||
}
|
||||
@ -1406,6 +1406,16 @@ BOOL pdb_set_logons_divs (SAM_ACCOUNT *sampass, uint16 hours)
|
||||
return True;
|
||||
}
|
||||
|
||||
BOOL pdb_set_init_flag (SAM_ACCOUNT *sampass, uint32 flag)
|
||||
{
|
||||
if (!sampass)
|
||||
return False;
|
||||
|
||||
sampass->init_flag |= flag;
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
BOOL pdb_set_uid (SAM_ACCOUNT *sampass, const uid_t uid)
|
||||
{
|
||||
if (!sampass)
|
||||
@ -1520,7 +1530,7 @@ BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, const char *fullname)
|
||||
Set the user's logon script.
|
||||
********************************************************************/
|
||||
|
||||
BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script)
|
||||
BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script, BOOL store)
|
||||
{
|
||||
if (!sampass)
|
||||
return False;
|
||||
@ -1530,6 +1540,9 @@ BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script)
|
||||
|
||||
StrnCpy (sampass->logon_script, logon_script, strlen(logon_script));
|
||||
|
||||
if (store)
|
||||
pdb_set_init_flag(sampass, FLAG_SAM_LOGONSCRIPT);
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
@ -1537,7 +1550,7 @@ BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script)
|
||||
Set the user's profile path.
|
||||
********************************************************************/
|
||||
|
||||
BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path)
|
||||
BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path, BOOL store)
|
||||
{
|
||||
if (!sampass)
|
||||
return False;
|
||||
@ -1547,6 +1560,9 @@ BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path)
|
||||
|
||||
StrnCpy (sampass->profile_path, profile_path, strlen(profile_path));
|
||||
|
||||
if (store)
|
||||
pdb_set_init_flag(sampass, FLAG_SAM_PROFILE);
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
@ -1554,7 +1570,7 @@ BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path)
|
||||
Set the user's directory drive.
|
||||
********************************************************************/
|
||||
|
||||
BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive)
|
||||
BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive, BOOL store)
|
||||
{
|
||||
if (!sampass)
|
||||
return False;
|
||||
@ -1564,6 +1580,9 @@ BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive)
|
||||
|
||||
StrnCpy (sampass->dir_drive, dir_drive, strlen(dir_drive));
|
||||
|
||||
if (store)
|
||||
pdb_set_init_flag(sampass, FLAG_SAM_DRIVE);
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
@ -1571,7 +1590,7 @@ BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive)
|
||||
Set the user's home directory.
|
||||
********************************************************************/
|
||||
|
||||
BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *homedir)
|
||||
BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *homedir, BOOL store)
|
||||
{
|
||||
if (!sampass)
|
||||
return False;
|
||||
@ -1581,6 +1600,9 @@ BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *homedir)
|
||||
|
||||
StrnCpy (sampass->home_dir, homedir, strlen(homedir));
|
||||
|
||||
if (store)
|
||||
pdb_set_init_flag(sampass, FLAG_SAM_SMBHOME);
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
Unix SMB/Netbios implementation.
|
||||
Version 2.9.
|
||||
LDAP protocol helper functions for SAMBA
|
||||
Copyright (C) Gerald Carter 2001
|
||||
Copyright (C) Shahms King 2001
|
||||
Copyright (C) Jean François Micouleau 1998
|
||||
|
||||
@ -51,8 +52,7 @@
|
||||
#define SAM_ACCOUNT struct sam_passwd
|
||||
#endif
|
||||
|
||||
struct ldap_enum_info
|
||||
{
|
||||
struct ldap_enum_info {
|
||||
LDAP *ldap_struct;
|
||||
LDAPMessage *result;
|
||||
LDAPMessage *entry;
|
||||
@ -61,11 +61,14 @@ struct ldap_enum_info
|
||||
static struct ldap_enum_info global_ldap_ent;
|
||||
|
||||
|
||||
extern pstring samlogon_user;
|
||||
extern BOOL sam_logon_in_ssb;
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
open a connection to the ldap server.
|
||||
******************************************************************/
|
||||
static BOOL
|
||||
ldap_open_connection (LDAP ** ldap_struct)
|
||||
static BOOL ldap_open_connection (LDAP ** ldap_struct)
|
||||
{
|
||||
int port;
|
||||
int version, rc;
|
||||
@ -82,7 +85,7 @@ ldap_open_connection (LDAP ** ldap_struct)
|
||||
|
||||
if ((*ldap_struct = ldap_init(lp_ldap_server(), port)) == NULL) {
|
||||
DEBUG(0, ("The LDAP server is not responding !\n"));
|
||||
return (False);
|
||||
return False;
|
||||
}
|
||||
|
||||
/* Connect to older servers using SSL and V2 rather than Start TLS */
|
||||
@ -110,25 +113,31 @@ ldap_open_connection (LDAP ** ldap_struct)
|
||||
}
|
||||
if ((rc = ldap_start_tls_s (*ldap_struct, NULL, NULL)) != LDAP_SUCCESS)
|
||||
{
|
||||
DEBUG(0,
|
||||
("Failed to issue the StartTLS instruction: %s\n",
|
||||
DEBUG(0,("Failed to issue the StartTLS instruction: %s\n",
|
||||
ldap_err2string(rc)));
|
||||
return False;
|
||||
}
|
||||
DEBUG (2, ("StartTLS issued: using a TLS connection\n"));
|
||||
break;
|
||||
|
||||
case LDAP_SSL_ON:
|
||||
if (ldap_set_option (*ldap_struct, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS)
|
||||
{
|
||||
DEBUG(0, ("Failed to setup a TLS session\n"));
|
||||
}
|
||||
break;
|
||||
|
||||
case LDAP_SSL_OFF:
|
||||
default:
|
||||
/*
|
||||
* No special needs to setup options prior to the LDAP
|
||||
* bind (which should be called next via ldap_connect_system()
|
||||
*/
|
||||
break;
|
||||
}
|
||||
|
||||
DEBUG(2, ("ldap_open_connection: connection opened\n"));
|
||||
return (True);
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
@ -150,15 +159,19 @@ static BOOL ldap_connect_system(LDAP * ldap_struct)
|
||||
|
||||
/* removed the sasl_bind_s "EXTERNAL" stuff, as my testsuite
|
||||
(OpenLDAP) doesnt' seem to support it */
|
||||
|
||||
DEBUG(10,("ldap_connect_system: Binding to ldap server as \"%s\"\n",
|
||||
lp_ldap_admin_dn()));
|
||||
|
||||
if ((rc = ldap_simple_bind_s(ldap_struct, lp_ldap_admin_dn(),
|
||||
ldap_secret)) != LDAP_SUCCESS)
|
||||
{
|
||||
DEBUG(0, ("Bind failed: %s\n", ldap_err2string(rc)));
|
||||
return (False);
|
||||
return False;
|
||||
}
|
||||
|
||||
DEBUG(2, ("ldap_connect_system: succesful connection to the LDAP server\n"));
|
||||
return (True);
|
||||
return True;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
@ -171,8 +184,7 @@ static int ldap_search_one_user (LDAP * ldap_struct, const char *filter, LDAPMes
|
||||
|
||||
DEBUG(2, ("ldap_search_one_user: searching for:[%s]\n", filter));
|
||||
|
||||
rc = ldap_search_s (ldap_struct, lp_ldap_suffix (), scope,
|
||||
filter, NULL, 0, result);
|
||||
rc = ldap_search_s(ldap_struct, lp_ldap_suffix (), scope, filter, NULL, 0, result);
|
||||
|
||||
if (rc != LDAP_SUCCESS) {
|
||||
DEBUG(0,("ldap_search_one_user: Problem during the LDAP search: %s\n",
|
||||
@ -180,7 +192,8 @@ static int ldap_search_one_user (LDAP * ldap_struct, const char *filter, LDAPMes
|
||||
DEBUG(3,("ldap_search_one_user: Query was: %s, %s\n", lp_ldap_suffix(),
|
||||
filter));
|
||||
}
|
||||
return (rc);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
@ -192,12 +205,13 @@ static int ldap_search_one_user_by_name (LDAP * ldap_struct, const char *user,
|
||||
pstring filter;
|
||||
|
||||
/*
|
||||
in the filter expression, replace %u with the real name
|
||||
so in ldap filter, %u MUST exist :-)
|
||||
* in the filter expression, replace %u with the real name
|
||||
* so in ldap filter, %u MUST exist :-)
|
||||
*/
|
||||
pstrcpy(filter, lp_ldap_filter());
|
||||
|
||||
/* have to use this here because $ is filtered out
|
||||
/*
|
||||
* have to use this here because $ is filtered out
|
||||
* in pstring_sub
|
||||
*/
|
||||
all_string_sub(filter, "%u", user, sizeof(pstring));
|
||||
@ -215,8 +229,14 @@ static int ldap_search_one_user_by_uid(LDAP * ldap_struct, int uid,
|
||||
pstring filter;
|
||||
|
||||
/* Get the username from the system and look that up in the LDAP */
|
||||
user = sys_getpwuid(uid);
|
||||
|
||||
if ((user = sys_getpwuid(uid)) == NULL) {
|
||||
DEBUG(3,("ldap_search_one_user_by_uid: Failed to locate uid [%d]\n", uid));
|
||||
return LDAP_NO_SUCH_OBJECT;
|
||||
}
|
||||
|
||||
pstrcpy(filter, lp_ldap_filter());
|
||||
|
||||
all_string_sub(filter, "%u", user->pw_name, sizeof(pstring));
|
||||
|
||||
return ldap_search_one_user(ldap_struct, filter, result);
|
||||
@ -232,6 +252,7 @@ static int ldap_search_one_user_by_rid (LDAP * ldap_struct, uint32 rid,
|
||||
int rc;
|
||||
|
||||
/* check if the user rid exsists, if not, try searching on the uid */
|
||||
|
||||
snprintf(filter, sizeof(filter) - 1, "rid=%i", rid);
|
||||
rc = ldap_search_one_user(ldap_struct, filter, result);
|
||||
|
||||
@ -245,20 +266,23 @@ static int ldap_search_one_user_by_rid (LDAP * ldap_struct, uint32 rid,
|
||||
/*******************************************************************
|
||||
search an attribute and return the first value found.
|
||||
******************************************************************/
|
||||
static void get_single_attribute (LDAP * ldap_struct, LDAPMessage * entry,
|
||||
static BOOL get_single_attribute (LDAP * ldap_struct, LDAPMessage * entry,
|
||||
char *attribute, char *value)
|
||||
{
|
||||
char **valeurs;
|
||||
char **values;
|
||||
|
||||
if ((valeurs = ldap_get_values (ldap_struct, entry, attribute)) != NULL) {
|
||||
pstrcpy(value, valeurs[0]);
|
||||
ldap_value_free(valeurs);
|
||||
DEBUG (2, ("get_single_attribute: [%s] = [%s]\n", attribute, value));
|
||||
}
|
||||
else {
|
||||
if ((values = ldap_get_values (ldap_struct, entry, attribute)) == NULL) {
|
||||
value = NULL;
|
||||
DEBUG (2, ("get_single_attribute: [%s] = [NULL]\n", attribute));
|
||||
DEBUG (2, ("get_single_attribute: [%s] = [<does not exist>]\n", attribute));
|
||||
|
||||
return False;
|
||||
}
|
||||
|
||||
pstrcpy(value, values[0]);
|
||||
ldap_value_free(values);
|
||||
DEBUG (2, ("get_single_attribute: [%s] = [%s]\n", attribute, value));
|
||||
|
||||
return True;
|
||||
}
|
||||
|
||||
/************************************************************************
|
||||
@ -298,7 +322,7 @@ static void make_a_mod (LDAPMod *** modlist, int modop, const char *attribute, c
|
||||
|
||||
if (mods[i] == NULL)
|
||||
{
|
||||
mods = (LDAPMod **) realloc (mods, (i + 2) * sizeof (LDAPMod *));
|
||||
mods = (LDAPMod **) Realloc (mods, (i + 2) * sizeof (LDAPMod *));
|
||||
if (mods == NULL)
|
||||
{
|
||||
DEBUG(0, ("make_a_mod: out of memory!\n"));
|
||||
@ -322,7 +346,7 @@ static void make_a_mod (LDAPMod *** modlist, int modop, const char *attribute, c
|
||||
if (mods[i]->mod_values != NULL) {
|
||||
for (; mods[i]->mod_values[j] != NULL; j++);
|
||||
}
|
||||
mods[i]->mod_values = (char **)realloc(mods[i]->mod_values,
|
||||
mods[i]->mod_values = (char **)Realloc(mods[i]->mod_values,
|
||||
(j + 2) * sizeof (char *));
|
||||
|
||||
if (mods[i]->mod_values == NULL) {
|
||||
@ -350,25 +374,45 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass,
|
||||
pass_last_set_time,
|
||||
pass_can_change_time,
|
||||
pass_must_change_time;
|
||||
static pstring username;
|
||||
static pstring domain;
|
||||
static pstring nt_username;
|
||||
static pstring fullname;
|
||||
static pstring homedir;
|
||||
static pstring dir_drive;
|
||||
static pstring logon_script;
|
||||
static pstring profile_path;
|
||||
static pstring acct_desc;
|
||||
static pstring munged_dial;
|
||||
static pstring workstations;
|
||||
pstring username,
|
||||
domain,
|
||||
nt_username,
|
||||
fullname,
|
||||
homedir,
|
||||
dir_drive,
|
||||
logon_script,
|
||||
profile_path,
|
||||
acct_desc,
|
||||
munged_dial,
|
||||
workstations;
|
||||
struct passwd *sys_user;
|
||||
uint32 user_rid, group_rid;
|
||||
static uint8 smblmpwd[16];
|
||||
static uint8 smbntpwd[16];
|
||||
uint16 acct_ctrl, logon_divs;
|
||||
uint32 user_rid,
|
||||
group_rid;
|
||||
uint8 smblmpwd[16],
|
||||
smbntpwd[16];
|
||||
uint16 acct_ctrl,
|
||||
logon_divs;
|
||||
uint32 hours_len;
|
||||
uint8 *hours;
|
||||
uint8 hours[MAX_HOURS_LEN];
|
||||
pstring temp;
|
||||
gid_t gid = getegid();
|
||||
|
||||
|
||||
/*
|
||||
* do a little initialization
|
||||
*/
|
||||
username[0] = '\0';
|
||||
domain[0] = '\0';
|
||||
nt_username[0] = '\0';
|
||||
fullname[0] = '\0';
|
||||
homedir[0] = '\0';
|
||||
dir_drive[0] = '\0';
|
||||
logon_script[0] = '\0';
|
||||
profile_path[0] = '\0';
|
||||
acct_desc[0] = '\0';
|
||||
munged_dial[0] = '\0';
|
||||
workstations[0] = '\0';
|
||||
|
||||
|
||||
if (sampass == NULL || ldap_struct == NULL || entry == NULL) {
|
||||
DEBUG(0, ("init_sam_from_ldap: NULL parameters found!\n"));
|
||||
@ -378,10 +422,10 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass,
|
||||
get_single_attribute(ldap_struct, entry, "uid", username);
|
||||
DEBUG(2, ("Entry found for user: %s\n", username));
|
||||
|
||||
pstrcpy(samlogon_user, username);
|
||||
|
||||
pstrcpy(nt_username, username);
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "sambaDomain", domain);
|
||||
if (!domain)
|
||||
pstrcpy(domain, lp_workgroup());
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "pwdLastSet", temp);
|
||||
@ -405,43 +449,53 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass,
|
||||
/* recommend that 'gecos' and 'displayName' should refer to the same
|
||||
* attribute OID. userFullName depreciated, only used by Samba
|
||||
* primary rules of LDAP: don't make a new attribute when one is already defined
|
||||
* that fits your needs; using gecos then displayName then cn rather than 'userFullName'
|
||||
* that fits your needs; using cn then displayName rather than 'userFullName'
|
||||
*/
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "gecos", fullname);
|
||||
sam_logon_in_ssb = True;
|
||||
|
||||
if (!fullname) {
|
||||
if (!get_single_attribute(ldap_struct, entry, "cn", fullname)) {
|
||||
get_single_attribute(ldap_struct, entry, "displayName", fullname);
|
||||
get_single_attribute(ldap_struct, entry, "cn", fullname);
|
||||
}
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "homeDrive", dir_drive);
|
||||
DEBUG(5,("homeDrive is set to %s\n",dir_drive));
|
||||
if (!*dir_drive) {
|
||||
|
||||
if (!get_single_attribute(ldap_struct, entry, "homeDrive", dir_drive)) {
|
||||
pstrcpy(dir_drive, lp_logon_drive());
|
||||
standard_sub_advanced(-1, username, "", gid, username, dir_drive);
|
||||
DEBUG(5,("homeDrive fell back to %s\n",dir_drive));
|
||||
pdb_set_dir_drive(sampass, dir_drive, False);
|
||||
}
|
||||
else
|
||||
pdb_set_dir_drive(sampass, dir_drive, True);
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "smbHome", homedir);
|
||||
DEBUG(5,("smbHome is set to %s\n",homedir));
|
||||
if (!*homedir) {
|
||||
if (!get_single_attribute(ldap_struct, entry, "smbHome", homedir)) {
|
||||
pstrcpy(homedir, lp_logon_home());
|
||||
standard_sub_advanced(-1, username, "", gid, username, homedir);
|
||||
DEBUG(5,("smbHome fell back to %s\n",homedir));
|
||||
pdb_set_homedir(sampass, homedir, False);
|
||||
}
|
||||
else
|
||||
pdb_set_homedir(sampass, homedir, True);
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "scriptPath", logon_script);
|
||||
DEBUG(5,("scriptPath is set to %s\n",logon_script));
|
||||
if (!*logon_script) {
|
||||
if (!get_single_attribute(ldap_struct, entry, "scriptPath", logon_script)) {
|
||||
pstrcpy(logon_script, lp_logon_script());
|
||||
standard_sub_advanced(-1, username, "", gid, username, logon_script);
|
||||
DEBUG(5,("scriptPath fell back to %s\n",logon_script));
|
||||
pdb_set_logon_script(sampass, logon_script, False);
|
||||
}
|
||||
else
|
||||
pdb_set_logon_script(sampass, logon_script, True);
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "profilePath", profile_path);
|
||||
DEBUG(5,("profilePath is set to %s\n",profile_path));
|
||||
if (!*profile_path) {
|
||||
if (!get_single_attribute(ldap_struct, entry, "profilePath", profile_path)) {
|
||||
pstrcpy(profile_path, lp_logon_path());
|
||||
standard_sub_advanced(-1, username, "", gid, username, profile_path);
|
||||
DEBUG(5,("profilePath fell back to %s\n",profile_path));
|
||||
pdb_set_profile_path(sampass, profile_path, False);
|
||||
}
|
||||
else
|
||||
pdb_set_profile_path(sampass, profile_path, True);
|
||||
|
||||
sam_logon_in_ssb = False;
|
||||
|
||||
get_single_attribute(ldap_struct, entry, "description", acct_desc);
|
||||
get_single_attribute(ldap_struct, entry, "userWorkstations", workstations);
|
||||
@ -452,20 +506,19 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass,
|
||||
|
||||
|
||||
/* These values MAY be in LDAP, but they can also be retrieved through
|
||||
* sys_getpw*() which is how we're doing it (if you use nss_ldap, then
|
||||
* these values will be stored in LDAP as well, but if not, we want the
|
||||
* local values to override the LDAP for this anyway
|
||||
* homeDirectory attribute
|
||||
* sys_getpw*() which is how we're doing it
|
||||
*/
|
||||
sys_user = sys_getpwnam(username);
|
||||
if (sys_user == NULL)
|
||||
if (sys_user == NULL) {
|
||||
DEBUG (2,("init_sam_from_ldap: User [%s] does not ave a uid!\n", username));
|
||||
return False;
|
||||
}
|
||||
|
||||
|
||||
/* FIXME: hours stuff should be cleaner */
|
||||
|
||||
logon_divs = 168;
|
||||
hours_len = 21;
|
||||
hours = malloc(sizeof(hours) * hours_len);
|
||||
memset(hours, 0xff, hours_len);
|
||||
|
||||
get_single_attribute (ldap_struct, entry, "lmPassword", temp);
|
||||
@ -504,13 +557,10 @@ static BOOL init_sam_from_ldap (SAM_ACCOUNT * sampass,
|
||||
|
||||
pdb_set_fullname(sampass, fullname);
|
||||
|
||||
pdb_set_logon_script(sampass, logon_script);
|
||||
pdb_set_profile_path(sampass, profile_path);
|
||||
pdb_set_dir_drive(sampass, dir_drive);
|
||||
pdb_set_homedir(sampass, homedir);
|
||||
pdb_set_acct_desc(sampass, acct_desc);
|
||||
pdb_set_workstations(sampass, workstations);
|
||||
pdb_set_munged_dial(sampass, munged_dial);
|
||||
|
||||
if (!pdb_set_nt_passwd(sampass, smbntpwd))
|
||||
return False;
|
||||
if (!pdb_set_lanman_passwd(sampass, smblmpwd))
|
||||
@ -549,12 +599,6 @@ static BOOL init_ldap_from_sam (LDAPMod *** mods, int ldap_state, const SAM_ACCO
|
||||
make_a_mod(mods, ldap_state, "uid", pdb_get_username(sampass));
|
||||
DEBUG(2, ("Setting entry for user: %s\n", pdb_get_username(sampass)));
|
||||
|
||||
/* not sure about using this for the nt_username */
|
||||
make_a_mod(mods, ldap_state, "sambaDomain", pdb_get_domain(sampass));
|
||||
|
||||
slprintf(temp, sizeof(temp) - 1, "%i", pdb_get_uid(sampass));
|
||||
make_a_mod(mods, ldap_state, "uidNumber", temp);
|
||||
|
||||
slprintf (temp, sizeof (temp) - 1, "%li", pdb_get_pass_last_set_time(sampass));
|
||||
make_a_mod(mods, ldap_state, "pwdLastSet", temp);
|
||||
|
||||
@ -581,38 +625,45 @@ static BOOL init_ldap_from_sam (LDAPMod *** mods, int ldap_state, const SAM_ACCO
|
||||
|
||||
make_a_mod(mods, ldap_state, "displayName", pdb_get_fullname(sampass));
|
||||
make_a_mod(mods, ldap_state, "cn", pdb_get_fullname(sampass));
|
||||
|
||||
make_a_mod(mods, ldap_state, "smbHome", pdb_get_homedir(sampass));
|
||||
make_a_mod(mods, ldap_state, "homeDrive", pdb_get_dirdrive(sampass));
|
||||
make_a_mod(mods, ldap_state, "scriptPath", pdb_get_logon_script(sampass));
|
||||
make_a_mod(mods, ldap_state, "profilePath", pdb_get_profile_path(sampass));
|
||||
make_a_mod(mods, ldap_state, "description", pdb_get_acct_desc(sampass));
|
||||
make_a_mod(mods, ldap_state, "userWorkstations", pdb_get_workstations(sampass));
|
||||
|
||||
/*
|
||||
* Only updates fields which have been set (not defaults from smb.conf)
|
||||
*/
|
||||
|
||||
if (IS_SAM_SET(sampass, FLAG_SAM_SMBHOME))
|
||||
make_a_mod(mods, ldap_state, "smbHome", pdb_get_homedir(sampass));
|
||||
|
||||
if (IS_SAM_SET(sampass, FLAG_SAM_DRIVE))
|
||||
make_a_mod(mods, ldap_state, "homeDrive", pdb_get_dirdrive(sampass));
|
||||
|
||||
if (IS_SAM_SET(sampass, FLAG_SAM_LOGONSCRIPT))
|
||||
make_a_mod(mods, ldap_state, "scriptPath", pdb_get_logon_script(sampass));
|
||||
|
||||
if (IS_SAM_SET(sampass, FLAG_SAM_PROFILE))
|
||||
make_a_mod(mods, ldap_state, "profilePath", pdb_get_profile_path(sampass));
|
||||
|
||||
|
||||
if ( !sampass->user_rid)
|
||||
slprintf(temp, sizeof(temp) - 1, "%i", pdb_uid_to_user_rid(pdb_get_uid(sampass)));
|
||||
else
|
||||
slprintf(temp, sizeof(temp) - 1, "%i", sampass->user_rid);
|
||||
make_a_mod(mods, ldap_state, "rid", temp);
|
||||
|
||||
if ( !sampass->group_rid) {
|
||||
GROUP_MAP map;
|
||||
|
||||
if (get_group_map_from_gid(pdb_get_gid(sampass), &map, MAPPING_WITHOUT_PRIV)) {
|
||||
sid_peek_rid(&map.sid, &sampass->group_rid);
|
||||
}
|
||||
if ( !sampass->group_rid)
|
||||
slprintf(temp, sizeof(temp) - 1, "%i", pdb_gid_to_group_rid(pdb_get_gid(sampass)));
|
||||
else
|
||||
sampass->group_rid = pdb_gid_to_group_rid(pdb_get_gid(sampass));
|
||||
}
|
||||
|
||||
slprintf(temp, sizeof(temp) - 1, "%i", sampass->group_rid);
|
||||
make_a_mod(mods, ldap_state, "primaryGroupID", temp);
|
||||
|
||||
/* FIXME: Hours stuff goes in LDAP */
|
||||
pdb_sethexpwd (temp, pdb_get_lanman_passwd(sampass), pdb_get_acct_ctrl(sampass));
|
||||
make_a_mod (mods, ldap_state, "lmPassword", temp);
|
||||
|
||||
pdb_sethexpwd (temp, pdb_get_nt_passwd(sampass), pdb_get_acct_ctrl(sampass));
|
||||
make_a_mod (mods, ldap_state, "ntPassword", temp);
|
||||
|
||||
make_a_mod (mods, ldap_state, "acctFlags", pdb_encode_acct_ctrl (pdb_get_acct_ctrl(sampass),
|
||||
NEW_PW_FORMAT_SPACE_PADDED_LEN));
|
||||
|
||||
@ -714,8 +765,7 @@ BOOL pdb_getsampwnam(SAM_ACCOUNT * user, const char *sname)
|
||||
ldap_unbind(ldap_struct);
|
||||
return False;
|
||||
}
|
||||
if (ldap_search_one_user_by_name(ldap_struct, sname, &result) !=
|
||||
LDAP_SUCCESS)
|
||||
if (ldap_search_one_user_by_name(ldap_struct, sname, &result) != LDAP_SUCCESS)
|
||||
{
|
||||
ldap_unbind(ldap_struct);
|
||||
return False;
|
||||
@ -916,7 +966,8 @@ BOOL pdb_add_sam_account(const SAM_ACCOUNT * newpwd)
|
||||
LDAPMessage *result;
|
||||
pstring dn;
|
||||
LDAPMod **mods;
|
||||
int ldap_op = LDAP_MOD_ADD;
|
||||
int ldap_op;
|
||||
uint32 num_result;
|
||||
|
||||
if (!ldap_open_connection(&ldap_struct)) /* open a connection to the server */
|
||||
{
|
||||
@ -929,16 +980,6 @@ BOOL pdb_add_sam_account(const SAM_ACCOUNT * newpwd)
|
||||
return False;
|
||||
}
|
||||
|
||||
if (pdb_get_username(newpwd) != NULL) {
|
||||
slprintf (dn, sizeof (dn) - 1, "uid=%s,%s",
|
||||
pdb_get_username(newpwd), lp_ldap_suffix ());
|
||||
}
|
||||
else
|
||||
{
|
||||
return False;
|
||||
}
|
||||
|
||||
|
||||
rc = ldap_search_one_user_by_name (ldap_struct, pdb_get_username(newpwd), &result);
|
||||
|
||||
if (ldap_count_entries(ldap_struct, result) != 0)
|
||||
@ -952,10 +993,18 @@ BOOL pdb_add_sam_account(const SAM_ACCOUNT * newpwd)
|
||||
|
||||
slprintf (filter, sizeof (filter) - 1, "uid=%s", pdb_get_username(newpwd));
|
||||
rc = ldap_search_one_user(ldap_struct, filter, &result);
|
||||
if (ldap_count_entries(ldap_struct, result) == 1)
|
||||
{
|
||||
num_result = ldap_count_entries(ldap_struct, result);
|
||||
|
||||
if (num_result > 1) {
|
||||
DEBUG (0, ("More than one user with that uid exists: bailing out!\n"));
|
||||
return False;
|
||||
}
|
||||
|
||||
/* Check if we need to update an existing entry */
|
||||
if (num_result == 1) {
|
||||
char *tmp;
|
||||
LDAPMessage *entry;
|
||||
|
||||
DEBUG(3,("User exists without samba properties: adding them\n"));
|
||||
ldap_op = LDAP_MOD_REPLACE;
|
||||
entry = ldap_first_entry (ldap_struct, result);
|
||||
@ -963,10 +1012,11 @@ BOOL pdb_add_sam_account(const SAM_ACCOUNT * newpwd)
|
||||
slprintf (dn, sizeof (dn) - 1, "%s", tmp);
|
||||
ldap_memfree (tmp);
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG (3, ("More than one user with that uid exists: bailing out!\n"));
|
||||
return False;
|
||||
else {
|
||||
/* Check if we need to add an entry */
|
||||
DEBUG(3,("Adding new user\n"));
|
||||
ldap_op = LDAP_MOD_ADD;
|
||||
slprintf (dn, sizeof (dn) - 1, "uid=%s,%s", pdb_get_username(newpwd), lp_ldap_suffix ());
|
||||
}
|
||||
|
||||
ldap_msgfree(result);
|
||||
|
||||
@ -47,6 +47,8 @@
|
||||
#include <rpcsvc/nis.h>
|
||||
|
||||
extern int DEBUGLEVEL;
|
||||
extern pstring samlogon_user;
|
||||
extern BOOL sam_logon_in_ssb;
|
||||
|
||||
struct nisp_enum_info
|
||||
{
|
||||
@ -320,36 +322,54 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, const nis_object *obj
|
||||
|
||||
/* values, must exist for user */
|
||||
if( !(pdb_get_acct_ctrl(pw_buf) & ACB_WSTRUST) ) {
|
||||
/* FIXME!! This doesn't belong here.
|
||||
Should be set in net_sam_logon()
|
||||
--jerry */
|
||||
pstrcpy(samlogon_user, pdb_get_username(pw_buf));
|
||||
|
||||
get_single_attribute(obj, NPF_HOME_DIR, home_dir, sizeof(pstring));
|
||||
if( !(home_dir && *home_dir) )
|
||||
if( !(home_dir && *home_dir) ) {
|
||||
pstrcpy(home_dir, lp_logon_home());
|
||||
pdb_set_homedir(pw_buf, home_dir);
|
||||
pdb_set_homedir(pw_buf, home_dir, False);
|
||||
}
|
||||
else
|
||||
pdb_set_homedir(pw_buf, home_dir, True);
|
||||
|
||||
get_single_attribute(obj, NPF_DIR_DRIVE, home_drive, sizeof(pstring));
|
||||
if( !(home_drive && *home_drive) )
|
||||
if( !(home_drive && *home_drive) ) {
|
||||
pstrcpy(home_drive, lp_logon_drive());
|
||||
pdb_set_dir_drive(pw_buf, home_drive);
|
||||
pdb_set_dir_drive(pw_buf, home_drive, False);
|
||||
}
|
||||
else
|
||||
pdb_set_dir_drive(pw_buf, home_drive, True);
|
||||
|
||||
get_single_attribute(obj, NPF_LOGON_SCRIPT, logon_script,
|
||||
sizeof(pstring));
|
||||
if( !(logon_script && *logon_script) )
|
||||
pstrcpy(logon_script, lp_logon_script());
|
||||
pdb_set_logon_script(pw_buf, logon_script);
|
||||
if( !(logon_script && *logon_script) ) {
|
||||
pstrcpy(logon_script, lp_logon_script(), False);
|
||||
}
|
||||
else
|
||||
pdb_set_logon_script(pw_buf, logon_script, True);
|
||||
|
||||
get_single_attribute(obj, NPF_PROFILE_PATH, profile_path,
|
||||
sizeof(pstring));
|
||||
if( !(profile_path && *profile_path) )
|
||||
get_single_attribute(obj, NPF_PROFILE_PATH, profile_path, sizeof(pstring));
|
||||
if( !(profile_path && *profile_path) ) {
|
||||
pstrcpy(profile_path, lp_logon_path());
|
||||
pdb_set_profile_path(pw_buf, profile_path);
|
||||
} else {
|
||||
pdb_set_profile_path(pw_buf, profile_path, False);
|
||||
}
|
||||
else
|
||||
pdb_set_profile_path(pw_buf, profile_path, True);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
/* lkclXXXX this is OBSERVED behaviour by NT PDCs, enforced here. */
|
||||
pdb_set_group_rid (pw_buf, DOMAIN_GROUP_RID_USERS);
|
||||
}
|
||||
|
||||
/* Check the lanman password column. */
|
||||
ptr = (char *)ENTRY_VAL(obj, NPF_LMPWD);
|
||||
pdb_set_lanman_passwd(pw_buf, NULL);
|
||||
if (!pdb_set_lanman_passwd(pw_buf, NULL))
|
||||
return False;
|
||||
|
||||
if (!strncasecmp(ptr, "NO PASSWORD", 11)) {
|
||||
pdb_set_acct_ctrl(pw_buf, pdb_get_acct_ctrl(pw_buf) | ACB_PWNOTREQ);
|
||||
@ -359,21 +379,25 @@ static BOOL make_sam_from_nisp_object(SAM_ACCOUNT *pw_buf, const nis_object *obj
|
||||
pdb_get_username(pw_buf)));
|
||||
return False;
|
||||
}
|
||||
pdb_set_lanman_passwd(pw_buf, smbpwd);
|
||||
if (!pdb_set_lanman_passwd(pw_buf, smbpwd))
|
||||
return False;
|
||||
}
|
||||
|
||||
/* Check the NT password column. */
|
||||
ptr = ENTRY_VAL(obj, NPF_NTPWD);
|
||||
pdb_set_nt_passwd(pw_buf, NULL);
|
||||
if (!pdb_set_nt_passwd(pw_buf, NULL))
|
||||
return False;
|
||||
|
||||
if (!(pdb_get_acct_ctrl(pw_buf) & ACB_PWNOTREQ) &&
|
||||
strncasecmp(ptr, "NO PASSWORD", 11)) {
|
||||
if (strlen(ptr) != 32 || !pdb_gethexpwd(ptr, smbntpwd)) {
|
||||
DEBUG(0, ("malformed NT pwd entry: uid = %d.\n",
|
||||
DEBUG(0, ("malformed NT pwd entry:\
|
||||
uid = %d.\n",
|
||||
pdb_get_uid(pw_buf)));
|
||||
return False;
|
||||
}
|
||||
pdb_set_nt_passwd(pw_buf, smbntpwd);
|
||||
if (!pdb_set_nt_passwd(pw_buf, smbntpwd))
|
||||
return False;
|
||||
}
|
||||
|
||||
pdb_set_unknown_3(pw_buf, 0xffffff); /* don't know */
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
struct smb_passwd
|
||||
{
|
||||
uid_t smb_userid; /* this is actually the unix uid_t */
|
||||
const char *smb_name; /* username string */
|
||||
char *smb_name; /* username string */
|
||||
|
||||
const unsigned char *smb_passwd; /* Null if no password */
|
||||
const unsigned char *smb_nt_passwd; /* Null if no password */
|
||||
@ -1149,7 +1149,7 @@ static BOOL build_smb_pass (struct smb_passwd *smb_pw, const SAM_ACCOUNT *sampas
|
||||
ZERO_STRUCTP(smb_pw);
|
||||
|
||||
smb_pw->smb_userid=uid;
|
||||
smb_pw->smb_name=pdb_get_username(sampass);
|
||||
smb_pw->smb_name=(char*)pdb_get_username(sampass);
|
||||
|
||||
smb_pw->smb_passwd=pdb_get_lanman_passwd(sampass);
|
||||
smb_pw->smb_nt_passwd=pdb_get_nt_passwd(sampass);
|
||||
@ -1234,7 +1234,7 @@ static BOOL build_sam_account(SAM_ACCOUNT *sam_pass, const struct smb_passwd *pw
|
||||
pdb_set_pass_can_change_time (sam_pass, pw_buf->pass_last_set_time);
|
||||
pdb_set_domain (sam_pass, lp_workgroup());
|
||||
|
||||
pdb_set_dir_drive (sam_pass, lp_logon_drive());
|
||||
pdb_set_dir_drive (sam_pass, lp_logon_drive(), False);
|
||||
|
||||
#if 0 /* JERRY */
|
||||
/* the smbpasswd format doesn't have a must change time field, so
|
||||
@ -1250,19 +1250,19 @@ static BOOL build_sam_account(SAM_ACCOUNT *sam_pass, const struct smb_passwd *pw
|
||||
|
||||
pstrcpy(str, lp_logon_path());
|
||||
standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str);
|
||||
pdb_set_profile_path(sam_pass, str);
|
||||
pdb_set_profile_path(sam_pass, str, False);
|
||||
|
||||
pstrcpy(str, lp_logon_home());
|
||||
standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str);
|
||||
pdb_set_homedir(sam_pass, str);
|
||||
pdb_set_homedir(sam_pass, str, False);
|
||||
|
||||
pstrcpy(str, lp_logon_drive());
|
||||
standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str);
|
||||
pdb_set_dir_drive(sam_pass, str);
|
||||
pdb_set_dir_drive(sam_pass, str, False);
|
||||
|
||||
pstrcpy(str, lp_logon_script());
|
||||
standard_sub_advanced(-1, pwfile->pw_name, "", pwfile->pw_gid, pw_buf->smb_name, str);
|
||||
pdb_set_logon_script(sam_pass, str);
|
||||
pdb_set_logon_script(sam_pass, str, False);
|
||||
|
||||
} else {
|
||||
/* lkclXXXX this is OBSERVED behaviour by NT PDCs, enforced here. */
|
||||
|
||||
@ -74,27 +74,21 @@ static void usage(void)
|
||||
|
||||
static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdstyle)
|
||||
{
|
||||
uid_t uid;
|
||||
gid_t gid;
|
||||
|
||||
/* TODO: chaeck if entry is a user or a workstation */
|
||||
if (!sam_pwent) return -1;
|
||||
|
||||
if (verbosity) {
|
||||
printf ("username: %s\n", pdb_get_username(sam_pwent));
|
||||
if ((uid = pdb_get_uid(sam_pwent)) && (gid = pdb_get_gid(sam_pwent))) {
|
||||
printf ("user ID/Group: %d/%d\n", (unsigned int)uid,
|
||||
(unsigned int)gid);
|
||||
}
|
||||
printf ("user RID/GRID: %u/%u\n", (unsigned int)sam_pwent->user_rid,
|
||||
(unsigned int)sam_pwent->group_rid);
|
||||
printf ("Full Name: %s\n", pdb_get_fullname(sam_pwent));
|
||||
printf ("Home Directory: %s\n", pdb_get_homedir(sam_pwent));
|
||||
printf ("HomeDir Drive: %s\n", pdb_get_dirdrive(sam_pwent));
|
||||
printf ("Logon Script: %s\n", pdb_get_logon_script(sam_pwent));
|
||||
printf ("Profile Path: %s\n", pdb_get_profile_path(sam_pwent));
|
||||
printf ("username: %s\n", sam_pwent->username);
|
||||
printf ("user ID/Group: %d/%d\n", sam_pwent->uid,
|
||||
sam_pwent->gid);
|
||||
printf ("user RID/GRID: %d/%d\n", sam_pwent->user_rid,
|
||||
sam_pwent->group_rid);
|
||||
printf ("Full Name: %s\n", sam_pwent->full_name);
|
||||
printf ("Home Directory: %s\n", sam_pwent->home_dir);
|
||||
printf ("HomeDir Drive: %s\n", sam_pwent->dir_drive);
|
||||
printf ("Logon Script: %s\n", sam_pwent->logon_script);
|
||||
printf ("Profile Path: %s\n", sam_pwent->profile_path);
|
||||
} else if (smbpwdstyle) {
|
||||
if ((uid = pdb_get_uid(sam_pwent))) {
|
||||
char lm_passwd[33];
|
||||
char nt_passwd[33];
|
||||
pdb_sethexpwd(lm_passwd,
|
||||
@ -106,20 +100,13 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst
|
||||
|
||||
printf("%s:%d:%s:%s:%s:LCT-%08X:\n",
|
||||
pdb_get_username(sam_pwent),
|
||||
(unsigned int)uid,
|
||||
pdb_get_uid(sam_pwent),
|
||||
lm_passwd,
|
||||
nt_passwd,
|
||||
pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
|
||||
(uint32)pdb_get_pass_last_set_time(sam_pwent));
|
||||
} else {
|
||||
fprintf(stderr, "Can't output in smbpasswd format, no uid on this record.\n");
|
||||
}
|
||||
} else {
|
||||
if ((uid = pdb_get_uid(sam_pwent))) {
|
||||
printf ("%s:%d:%s\n", pdb_get_username(sam_pwent), uid, pdb_get_fullname(sam_pwent));
|
||||
} else {
|
||||
printf ("%s:(null):%s\n", pdb_get_username(sam_pwent), pdb_get_fullname(sam_pwent));
|
||||
}
|
||||
printf ("%s:%d:%s\n", sam_pwent->username, sam_pwent->uid, sam_pwent->full_name);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@ -159,7 +146,7 @@ static int print_users_list (BOOL verbosity, BOOL smbpwdstyle)
|
||||
BOOL ret;
|
||||
|
||||
pdb_init_sam(&sam_pwent);
|
||||
errno = 0; /* testing --simo */
|
||||
|
||||
ret = pdb_setsampwent(False);
|
||||
if (ret && errno == ENOENT) {
|
||||
fprintf (stderr,"Password database not found!\n");
|
||||
@ -200,13 +187,13 @@ static int set_user_info (char *username, char *fullname, char *homedir, char *d
|
||||
if (fullname)
|
||||
pdb_set_fullname(sam_pwent, fullname);
|
||||
if (homedir)
|
||||
pdb_set_homedir(sam_pwent, homedir);
|
||||
pdb_set_homedir(sam_pwent, homedir, True);
|
||||
if (drive)
|
||||
pdb_set_dir_drive(sam_pwent,drive);
|
||||
pdb_set_dir_drive(sam_pwent, drive, True);
|
||||
if (script)
|
||||
pdb_set_logon_script(sam_pwent, script);
|
||||
pdb_set_logon_script(sam_pwent, script, True);
|
||||
if (profile)
|
||||
pdb_set_profile_path (sam_pwent, profile);
|
||||
pdb_set_profile_path (sam_pwent, profile, True);
|
||||
|
||||
if (pdb_update_sam_account (sam_pwent, True))
|
||||
print_user_info (username, True, False);
|
||||
@ -219,6 +206,91 @@ static int set_user_info (char *username, char *fullname, char *homedir, char *d
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*********************************************************
|
||||
A strdup with exit
|
||||
**********************************************************/
|
||||
|
||||
static char *strdup_x(const char *s)
|
||||
{
|
||||
char *new_s = strdup(s);
|
||||
if (!new_s) {
|
||||
fprintf(stderr,"out of memory\n");
|
||||
exit(1);
|
||||
}
|
||||
return new_s;
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
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.
|
||||
_copied_ from smbpasswd
|
||||
*************************************************************/
|
||||
static char *get_pass( char *prompt, BOOL stdin_get)
|
||||
{
|
||||
char *p;
|
||||
if (stdin_get) {
|
||||
p = stdin_new_passwd();
|
||||
} else {
|
||||
p = getpass(prompt);
|
||||
}
|
||||
return strdup_x(p);
|
||||
}
|
||||
|
||||
/*************************************************************
|
||||
Utility function to prompt for new password.
|
||||
_copied_ from smbpasswd
|
||||
*************************************************************/
|
||||
static char *prompt_for_new_password(BOOL stdin_get)
|
||||
{
|
||||
char *p;
|
||||
fstring new_passwd;
|
||||
|
||||
ZERO_ARRAY(new_passwd);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
/*********************************************************
|
||||
Add New User
|
||||
**********************************************************/
|
||||
@ -226,38 +298,44 @@ static int new_user (char *username, char *fullname, char *homedir, char *drive,
|
||||
{
|
||||
SAM_ACCOUNT *sam_pwent=NULL;
|
||||
struct passwd *pwd = NULL;
|
||||
char *password1, *password2;
|
||||
char *password;
|
||||
|
||||
ZERO_STRUCT(sam_pwent);
|
||||
|
||||
pdb_init_sam (&sam_pwent);
|
||||
|
||||
if (!(pwd = sys_getpwnam(username))) {
|
||||
fprintf (stderr, "User %s does not exist in system passwd!\n", username);
|
||||
return -1;
|
||||
}
|
||||
|
||||
pdb_init_sam_pw (&sam_pwent, pwd);
|
||||
|
||||
password1 = getpass("new password:");
|
||||
password2 = getpass("retype new password:");
|
||||
if (strcmp (password1, password2)) {
|
||||
fprintf (stderr, "Passwords does not match!\n");
|
||||
pdb_free_sam(&sam_pwent);
|
||||
return -1;
|
||||
}
|
||||
|
||||
pdb_set_plaintext_passwd(sam_pwent, password1);
|
||||
password = prompt_for_new_password(0);
|
||||
if (!password) {
|
||||
fprintf (stderr, "Passwords do not match!\n");
|
||||
pdb_free_sam(&sam_pwent);
|
||||
return -1;
|
||||
}
|
||||
|
||||
pdb_set_plaintext_passwd(sam_pwent, password);
|
||||
|
||||
pdb_set_username(sam_pwent, username);
|
||||
if (fullname)
|
||||
pdb_set_fullname(sam_pwent, fullname);
|
||||
if (homedir)
|
||||
pdb_set_homedir (sam_pwent, homedir);
|
||||
pdb_set_homedir (sam_pwent, homedir, True);
|
||||
if (drive)
|
||||
pdb_set_dir_drive (sam_pwent, drive);
|
||||
pdb_set_dir_drive (sam_pwent, drive, True);
|
||||
if (script)
|
||||
pdb_set_logon_script(sam_pwent, script);
|
||||
pdb_set_logon_script(sam_pwent, script, True);
|
||||
if (profile)
|
||||
pdb_set_profile_path (sam_pwent, profile);
|
||||
pdb_set_profile_path (sam_pwent, profile, True);
|
||||
|
||||
/* TODO: Check uid not being in MACHINE UID range!! */
|
||||
pdb_set_uid (sam_pwent, pwd->pw_uid);
|
||||
pdb_set_gid (sam_pwent, pwd->pw_gid);
|
||||
pdb_set_user_rid (sam_pwent, pdb_uid_to_user_rid (pwd->pw_uid));
|
||||
pdb_set_group_rid (sam_pwent, pdb_gid_to_group_rid (pwd->pw_gid));
|
||||
|
||||
pdb_set_acct_ctrl (sam_pwent, ACB_NORMAL);
|
||||
|
||||
@ -293,7 +371,7 @@ static int new_machine (char *machinename)
|
||||
safe_strcat (name, "$", 16);
|
||||
|
||||
string_set (&password, machinename);
|
||||
strlower_m(password);
|
||||
strlower(password);
|
||||
|
||||
pdb_set_plaintext_passwd (sam_pwent, password);
|
||||
|
||||
@ -301,7 +379,7 @@ static int new_machine (char *machinename)
|
||||
|
||||
for (uid=BASE_MACHINE_UID; uid<=MAX_MACHINE_UID; uid++) {
|
||||
pdb_init_sam (&sam_trust);
|
||||
if (pdb_getsampwrid (sam_trust, pdb_uid_to_user_rid (uid))) {
|
||||
if (pdb_getsampwuid (sam_trust, uid)) {
|
||||
pdb_free_sam(&sam_trust);
|
||||
} else {
|
||||
break;
|
||||
@ -314,6 +392,8 @@ static int new_machine (char *machinename)
|
||||
return -1;
|
||||
}
|
||||
|
||||
pdb_set_uid (sam_pwent, uid);
|
||||
pdb_set_gid (sam_pwent, BASE_MACHINE_UID); /* TODO: set there more appropriate value!! */
|
||||
pdb_set_user_rid (sam_pwent,pdb_uid_to_user_rid (uid));
|
||||
pdb_set_group_rid (sam_pwent, pdb_gid_to_group_rid (BASE_MACHINE_UID));
|
||||
pdb_set_acct_ctrl (sam_pwent, ACB_WSTRUST);
|
||||
@ -370,7 +450,10 @@ static int import_users (char *filename)
|
||||
long uidval;
|
||||
int line = 0;
|
||||
int good = 0;
|
||||
struct passwd *pwd;
|
||||
|
||||
if (!pdb_init_sam (&sam_pwent)) {
|
||||
fprintf (stderr, "pdb_init_sam FAILED!\n");
|
||||
}
|
||||
|
||||
if((fp = sys_fopen(filename, "rb")) == NULL) {
|
||||
fprintf (stderr, "%s\n", strerror (ferror (fp)));
|
||||
@ -383,6 +466,7 @@ static int import_users (char *filename)
|
||||
fgets(linebuf, 256, fp);
|
||||
if (ferror(fp)) {
|
||||
fprintf (stderr, "%s\n", strerror (ferror (fp)));
|
||||
pdb_free_sam(&sam_pwent);
|
||||
return -1;
|
||||
}
|
||||
if ((linebuf_len = strlen(linebuf)) == 0) {
|
||||
@ -400,16 +484,20 @@ static int import_users (char *filename)
|
||||
linebuf[linebuf_len] = '\0';
|
||||
if ((linebuf[0] == 0) && feof(fp)) {
|
||||
/*end of file!!*/
|
||||
pdb_free_sam(&sam_pwent);
|
||||
return 0;
|
||||
}
|
||||
line++;
|
||||
if (linebuf[0] == '#' || linebuf[0] == '\0')
|
||||
continue;
|
||||
|
||||
pdb_set_acct_ctrl (sam_pwent,ACB_NORMAL);
|
||||
|
||||
/* Get user name */
|
||||
p = (unsigned char *) strchr_m(linebuf, ':');
|
||||
if (p == NULL) {
|
||||
fprintf (stderr, "Error: malformed password entry at line %d !!\n", line);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
strncpy(user_name, linebuf, PTR_DIFF(p, linebuf));
|
||||
@ -419,29 +507,24 @@ static int import_users (char *filename)
|
||||
p++;
|
||||
if(*p == '-') {
|
||||
fprintf (stderr, "Error: negative uid at line %d\n", line);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
if (!isdigit(*p)) {
|
||||
fprintf (stderr, "Error: malformed password entry at line %d (uid not number)\n", line);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
uidval = atoi((char *) p);
|
||||
while (*p && isdigit(*p)) p++;
|
||||
if (*p != ':') {
|
||||
fprintf (stderr, "Error: malformed password entry at line %d (no : after uid)\n", line);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
if(!(pwd = sys_getpwnam(user_name))) {
|
||||
fprintf(stderr, "User %s does not \
|
||||
exist in system password file (usually /etc/passwd). Cannot add \
|
||||
account without a valid local system user.\n", user_name);
|
||||
return False;
|
||||
}
|
||||
|
||||
if (!pdb_init_sam_pw(&sam_pwent, pwd)) {
|
||||
fprintf(stderr, "Failed initialise SAM_ACCOUNT for user %s.\n", user_name);
|
||||
return False;
|
||||
}
|
||||
pdb_set_username(sam_pwent, user_name);
|
||||
pdb_set_uid (sam_pwent, uidval);
|
||||
|
||||
/* Get passwords */
|
||||
p++;
|
||||
@ -454,12 +537,12 @@ account without a valid local system user.\n", user_name);
|
||||
} else {
|
||||
if (linebuf_len < (PTR_DIFF(p, linebuf) + 33)) {
|
||||
fprintf (stderr, "Error: malformed password entry at line %d (password too short)\n",line);
|
||||
pdb_free_sam (&sam_pwent);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
if (p[32] != ':') {
|
||||
fprintf (stderr, "Error: malformed password entry at line %d (no terminating :)\n",line);
|
||||
pdb_free_sam (&sam_pwent);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
if (!strncasecmp((char *) p, "NO PASSWORD", 11)) {
|
||||
@ -468,12 +551,13 @@ account without a valid local system user.\n", user_name);
|
||||
} else {
|
||||
if (!pdb_gethexpwd((char *)p, smbpwd)) {
|
||||
fprintf (stderr, "Error: malformed Lanman password entry at line %d (non hex chars)\n", line);
|
||||
pdb_free_sam (&sam_pwent);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
pdb_set_lanman_passwd(sam_pwent, smbpwd);
|
||||
}
|
||||
/* NT password */
|
||||
pdb_set_nt_passwd(sam_pwent, smbpwd);
|
||||
p += 33;
|
||||
if ((linebuf_len >= (PTR_DIFF(p, linebuf) + 33)) && (p[32] == ':')) {
|
||||
if (*p != '*' && *p != 'X') {
|
||||
@ -515,17 +599,49 @@ account without a valid local system user.\n", user_name);
|
||||
}
|
||||
}
|
||||
|
||||
/* Old-style workstation account code droped. */
|
||||
|
||||
if (pdb_get_acct_ctrl(sam_pwent) & ACB_WSTRUST) {
|
||||
if ((uidval < BASE_MACHINE_UID) || (uidval > MAX_MACHINE_UID)) {
|
||||
fprintf (stderr, "Warning: Machine UID out of normal range %d-%d\n",
|
||||
BASE_MACHINE_UID,
|
||||
MAX_MACHINE_UID);
|
||||
}
|
||||
pdb_set_uid(sam_pwent, BASE_MACHINE_UID);
|
||||
}
|
||||
|
||||
/* Test if user is valid */
|
||||
if (pdb_get_acct_ctrl(sam_pwent) & ACB_NORMAL) {
|
||||
struct passwd *pwd = NULL;
|
||||
|
||||
if (!(pwd = sys_getpwnam(user_name))) {
|
||||
fprintf (stderr, "Error: User %s does not exist in system passwd!\n", user_name);
|
||||
continue;
|
||||
}
|
||||
pdb_set_gid(sam_pwent, pwd->pw_gid);
|
||||
}
|
||||
|
||||
/* Fill in sam_pwent structure */
|
||||
pdb_set_user_rid(sam_pwent, pdb_uid_to_user_rid (pdb_get_uid(sam_pwent)));
|
||||
pdb_set_group_rid(sam_pwent, pdb_gid_to_group_rid (pdb_get_gid(sam_pwent)));
|
||||
|
||||
/* TODO: set also full_name, home_dir, dir_drive, logon_script, profile_path, ecc...
|
||||
* when defaults will be available (after passdb redesign)
|
||||
* let them blank just now they are not used anyway
|
||||
*/
|
||||
|
||||
/* Now ADD the entry */
|
||||
if (!(pdb_add_sam_account (sam_pwent))) {
|
||||
fprintf (stderr, "Unable to add user entry!\n");
|
||||
pdb_free_sam (&sam_pwent);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
continue;
|
||||
}
|
||||
printf ("%s imported!\n", user_name);
|
||||
good++;
|
||||
pdb_free_sam (&sam_pwent);
|
||||
pdb_reset_sam (sam_pwent);
|
||||
}
|
||||
printf ("%d lines read.\n%d entryes imported\n", line, good);
|
||||
printf ("%d lines read.\n%d entries imported\n", line, good);
|
||||
pdb_free_sam(&sam_pwent);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -536,6 +652,7 @@ account without a valid local system user.\n", user_name);
|
||||
int main (int argc, char **argv)
|
||||
{
|
||||
int ch;
|
||||
static pstring servicesf = CONFIGFILE;
|
||||
BOOL list_users = False;
|
||||
BOOL verbose = False;
|
||||
BOOL spstyle = False;
|
||||
@ -552,6 +669,8 @@ int main (int argc, char **argv)
|
||||
char *profile_path = NULL;
|
||||
char *smbpasswd = NULL;
|
||||
|
||||
TimeInit();
|
||||
|
||||
setup_logging("pdbedit", True);
|
||||
|
||||
if (argc < 2) {
|
||||
@ -559,18 +678,21 @@ int main (int argc, char **argv)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!lp_load(servicesf,True,False,False)) {
|
||||
fprintf(stderr, "Can't load %s - run testparm to debug it\n",
|
||||
servicesf);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
secrets_init();
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwx")) != EOF) {
|
||||
while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwxD:")) != EOF) {
|
||||
switch(ch) {
|
||||
case 'a':
|
||||
add_user = True;
|
||||
@ -617,6 +739,9 @@ int main (int argc, char **argv)
|
||||
import = True;
|
||||
smbpasswd = optarg;
|
||||
break;
|
||||
case 'D':
|
||||
DEBUGLEVEL = atoi(optarg);
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user