From 99cdb462083381c88689a4e698ca48b6ed4cf5ac Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 15 Jan 2003 18:57:41 +0000 Subject: *lots of small merges form HEAD *sync up configure.in *don't build torture tools in make all *make sure to remove torture tools as part of make clean (This used to be commit 0fb724b3216eeeb97e61ff12755ca3a31bcad6ef) --- source3/smbd/chgpasswd.c | 10 +++++++--- source3/smbd/service.c | 6 +++--- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index cf5a0fc142..1c31d9757a 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -249,9 +249,9 @@ static int expect(int master, char *issue, char *expected) nread = 0; buffer[nread] = 0; - while ((len = read_with_timeout(master, buffer + nread, 1, - sizeof(buffer) - nread - 1, - timeout)) > 0) { + while ((len = read_socket_with_timeout(master, buffer + nread, 1, + sizeof(buffer) - nread - 1, + timeout)) > 0) { nread += len; buffer[nread] = 0; @@ -862,6 +862,10 @@ static NTSTATUS check_oem_password(const char *user, */ new_pw_len = IVAL(lmdata, 512); + + DEBUG(0, ("** new_pw_len = %d, new_passwd_size = %d\n", + new_pw_len, new_passwd_size)); + if (new_pw_len < 0 || new_pw_len > new_passwd_size - 1) { DEBUG(0,("check_oem_password: incorrect password length (%d).\n", new_pw_len)); pdb_free_sam(&sampass); diff --git a/source3/smbd/service.c b/source3/smbd/service.c index dd427c2ae8..2a41a6db1c 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -155,7 +155,7 @@ int find_service(fstring service) char *pszTemp; DEBUG(3,("checking whether %s is a valid printer name...\n", service)); - pszTemp = PRINTCAP; + pszTemp = lp_printcapname(); if ((pszTemp != NULL) && pcap_printername_ok(service, pszTemp)) { DEBUG(3,("%s is a valid printer name\n", service)); @@ -751,7 +751,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password, { uid_t euid; user_struct *vuser = NULL; - pstring service; + fstring service; int snum = -1; /* This must ONLY BE CALLED AS ROOT. As it exits this function as root. */ @@ -814,7 +814,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password, dev, status); } - pstrcpy(service, service_in); + fstrcpy(service, service_in); strlower(service); -- cgit