The branch, v3-0-test has been updated
via fdceef83eb5f8bd8546739c6642f78a790dcf207 (commit)
via c7e53dfeae88569fec3eeed0b88f545a1b956ccb (commit)
via 23d199fc736a8c053c16830c75d26a6ce5b84b2b (commit)
from 730af199e62de52a928179b3a6d280ddaba54d50 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit fdceef83eb5f8bd8546739c6642f78a790dcf207
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Wed Jul 2 10:50:50 2008 -0700
Ensure consistent use of pdb_get_nt_passwd instead of pdb_get_lanman_passwd.
Reported by hongbing Zhang <[EMAIL PROTECTED]>.
Jeremy.
commit c7e53dfeae88569fec3eeed0b88f545a1b956ccb
Merge: 23d199fc736a8c053c16830c75d26a6ce5b84b2b
730af199e62de52a928179b3a6d280ddaba54d50
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Mon Jun 30 09:16:15 2008 -0700
Merge branch 'v3-0-test' of ssh://[EMAIL PROTECTED]/data/git/samba into
v3-0-test
commit 23d199fc736a8c053c16830c75d26a6ce5b84b2b
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Fri Jun 27 15:30:52 2008 -0700
Fix usage message for net rpc trustdom add.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/pam_smbpass/support.c | 19 +++++++++++--------
source/utils/net_rpc.c | 2 +-
2 files changed, 12 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pam_smbpass/support.c b/source/pam_smbpass/support.c
index 2ee43ff..2062ec2 100644
--- a/source/pam_smbpass/support.c
+++ b/source/pam_smbpass/support.c
@@ -325,7 +325,7 @@ int _smb_verify_password( pam_handle_t * pamh, struct samu
*sampass,
}
#endif
- if (!pdb_get_lanman_passwd(sampass))
+ if (!pdb_get_nt_passwd(sampass))
{
_log_err( LOG_DEBUG, "user %s has null SMB password"
, name );
@@ -347,6 +347,7 @@ int _smb_verify_password( pam_handle_t * pamh, struct samu
*sampass,
data_name = SMB_MALLOC_ARRAY(char, sizeof(FAIL_PREFIX) + strlen( name ));
if (data_name == NULL) {
_log_err( LOG_CRIT, "no memory for data-name" );
+ return PAM_AUTH_ERR;
}
strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
strncpy( data_name + sizeof(FAIL_PREFIX) - 1, name, strlen( name ) + 1 );
@@ -415,13 +416,12 @@ int _smb_verify_password( pam_handle_t * pamh, struct
samu *sampass,
uidtoname(getuid()),
service ? service : "**unknown**", name);
}
- } else {
- _log_err(LOG_NOTICE,
- "failed auth request by %s for service %s as %s(%d)",
- uidtoname(getuid()),
- service ? service : "**unknown**", name);
- retval = PAM_AUTH_ERR;
}
+ _log_err(LOG_NOTICE,
+ "failed auth request by %s for service %s as %s(%d)",
+ uidtoname(getuid()),
+ service ? service : "**unknown**", name);
+ retval = PAM_AUTH_ERR;
}
_pam_delete( data_name );
@@ -450,7 +450,10 @@ int _smb_blankpasswd( unsigned int ctrl, struct samu
*sampass )
if (on( SMB__NONULL, ctrl ))
return 0; /* will fail but don't let on yet */
- if (pdb_get_lanman_passwd(sampass) == NULL)
+ if (!(pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ))
+ return 0;
+
+ if (pdb_get_nt_passwd(sampass) == NULL)
retval = 1;
else
retval = 0;
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index c65598f..4b77db9 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -5446,7 +5446,7 @@ static int rpc_trustdom_add(int argc, const char **argv)
return run_rpc_command(NULL, PI_SAMR, 0,
rpc_trustdom_add_internals,
argc, argv);
} else {
- d_printf("Usage: net rpc trustdom add <domain>\n");
+ d_printf("Usage: net rpc trustdom add <domain> <trust
password>\n");
return -1;
}
}
--
Samba Shared Repository
