summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-10-22 02:43:20 +0000
committerJeremy Allison <jra@samba.org>2001-10-22 02:43:20 +0000
commit61adb3396d4ab1a26764d76387976894524e6a76 (patch)
treeea25fdebaaa4aa26ac26eb0739ed571c16c20d7a
parentc032c2b36432d91cab4dbaf1ea4009b1194c4ccc (diff)
downloadsamba-61adb3396d4ab1a26764d76387976894524e6a76.tar.gz
samba-61adb3396d4ab1a26764d76387976894524e6a76.tar.bz2
samba-61adb3396d4ab1a26764d76387976894524e6a76.zip
Renamed inbuilt xstrdup to smb_xstrdup.
Jeremy. (This used to be commit cf99f9361370c521f28dcced008cbfec9fc38de5)
-rw-r--r--source3/pam_smbpass/support.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index 01f4aa30c7..8646792753 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -221,7 +221,7 @@ void _cleanup( pam_handle_t * pamh, void *x, int error_status )
* evidence of old token around for later stack analysis.
*/
-char * xstrdup( const char *x )
+char * smb_xstrdup( const char *x )
{
register char *new = NULL;
@@ -231,7 +231,7 @@ char * xstrdup( const char *x )
for (i = 0; x[i]; ++i); /* length of string */
if ((new = malloc(++i)) == NULL) {
i = 0;
- _log_err( LOG_CRIT, "out of memory in xstrdup" );
+ _log_err( LOG_CRIT, "out of memory in smb_xstrdup" );
} else {
while (i-- > 0) {
new[i] = x[i];
@@ -417,9 +417,9 @@ int _smb_verify_password( pam_handle_t * pamh
, smb_pwent->smb_userid );
new->count = 1;
}
- new->user = xstrdup( name );
+ new->user = smb_xstrdup( name );
new->id = smb_pwent->smb_userid;
- new->agent = xstrdup( uidtoname( getuid() ) );
+ new->agent = smb_xstrdup( uidtoname( getuid() ) );
pam_set_data( pamh, data_name, new, _cleanup_failures );
} else {
@@ -560,7 +560,7 @@ int _smb_read_password( pam_handle_t * pamh, unsigned int ctrl
if (retval == PAM_SUCCESS) { /* a good conversation */
- token = xstrdup(resp[j++].resp);
+ token = smb_xstrdup(resp[j++].resp);
if (token != NULL) {
if (expect == 2) {
/* verify that password entered correctly */