A few things in this commit:

cleanup some of the code in net_rpc_join re const warnings and
fstrings.

Passdb:

Make the %u and %U substituions in passdb work.
This is done by declaring these paramters to be 'const' and doing
the substitution manually.  I'm told this is us going full circle,
but I can't really see a better way.

Finally these things actually seem to work properly...

Make the lanman code use the pdb's recorded values for homedir etc
rather than the values from lp_*()

Add code to set the plaintext password in the passdb, where it can
decide how to store/set it.  For use with a future 'ldap password
change' option, or somthing like that...

Add pdb_unix, so as to remove the 'not in passdb' special cases from the
local_lookup_*() code.  Quite small, as it uses the new 'struct passwd ->
SAM_ACCOUNT' code that is now in just one place.  (also used by pdb_smbpasswd)

Other:
Fix up the adding of [homes] at session setup time to actually pass
the right string, that is the unix homedir, not the UNC path.

Fix up [homes] so that for winbind users is picks the correct name.
(bad interactions with the default domain code previously)

Change the rpc_server/srv_lsa_nt.c code to match NT when for the
SATUS_NONE_MAPPED reply:  This was only being triggered on
no queries, now it is on the 'no mappings' (ie all mappings failed).
Checked against Win2k.

Policy Question:  Should SID -> unix_user.234/unix_group.364 be
considered a mapping or not?  Currently it isn't.

Andrew Bartlett

1 files changed, 7 insertions, 2 deletions

diff --git a/source/include/smb.h b/source/include/smb.h
index 0e5a85ad151..ca146ff50a0 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -581,7 +581,7 @@ typedef struct {
 #define FLAG_SAM_KICKOFFTIME	0x00000100
 #define FLAG_SAM_CANCHANGETIME	0x00000200
 #define FLAG_SAM_MUSTCHANGETIME	0x00000400
-
+#define FLAG_SAM_PLAINTEXT_PW   0x00000800
 
 #define IS_SAM_UNIX_USER(x) \
 	((pdb_get_init_flag(x) & FLAG_SAM_UID) \
@@ -595,7 +595,7 @@ typedef struct sam_passwd
 	
 	void (*free_fn)(struct sam_passwd **);
 
-    struct pdb_methods *methods;
+	struct pdb_methods *methods;
 
 	struct user_data {
 		/* initiailization flags */
@@ -612,6 +612,7 @@ typedef struct sam_passwd
 		char * domain;       /* Windows Domain name */
 		char * nt_username;  /* Windows username string */
 		char * full_name;    /* user's full name string */
+		char * unix_home_dir;     /* UNIX home directory string */
 		char * home_dir;     /* home directory string */
 		char * dir_drive;    /* home directory drive string */
 		char * logon_script; /* logon script string */
@@ -628,6 +629,7 @@ typedef struct sam_passwd
 		
 		DATA_BLOB lm_pw; /* .data is Null if no password */
 		DATA_BLOB nt_pw; /* .data is Null if no password */
+		DATA_BLOB plaintext_pw; /* .data is Null if not available */
 		
 		uint16 acct_ctrl; /* account info (ACB_xxxx bit-mask) */
 		uint32 unknown_3; /* 0x00ff ffff */
@@ -639,6 +641,7 @@ typedef struct sam_passwd
 		uint32 unknown_5; /* 0x0002 0000 */
 		uint32 unknown_6; /* 0x0000 04ec */
 	} private;
+
 	/* Lets see if the remaining code can get the hint that you
 	   are meant to use the pdb_...() functions. */
 	
@@ -1578,6 +1581,8 @@ typedef struct user_struct
 
 	userdom_struct user;
 	char *homedir;
+	char *unix_homedir;
+	char *logon_script;
 	
 	BOOL guest;