From ac9b687cc2496409e1c8d86393812faf94ec7550 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 17 Sep 1998 19:16:12 +0000 Subject: configure configure.in: Added tests for fseek64 and ftell64. config.h.in: Added fseek64 and ftell64. includes.h: Added definition of SMB_BIG_INTEGER. smb.h: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. access.c: Tidyup of dbug statement. system.c: Added sys_fseek and sys_ftell. Changed mode calls to use mode_t. asyncdns.c: Tidyup of comment. loadparm.c: Tidyup of set_default_server_announce_type() function definition. ldap.c: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. nispass.c: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. smbpass.c: Changed (*getsmbpwpos) and (*setsmbpwpos) to use SMB_BIG_INTEGER. smbpassfile.c: Use sys_fseek(). chgpasswd.c: Tidyup of debug statement. dosmode.c: Changed mode calls to use mode_t. ipc.c: Removal of dead code. nttrans.c: Changed mode calls to use mode_t. open.c: Changed mode calls to use mode_t. pipes.c: Removal of dead code. reply.c: Removal of dead code. trans2.c: Removal of dead code. Changed mode calls to use mode_t. Jeremy. (This used to be commit c381d32e3dc23fe887408016cae821aceb30da2c) --- source3/passdb/ldap.c | 8 ++++---- source3/passdb/nispass.c | 8 ++++---- source3/passdb/smbpass.c | 14 +++++++------- source3/passdb/smbpassfile.c | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'source3/passdb') diff --git a/source3/passdb/ldap.c b/source3/passdb/ldap.c index ea25f48605..e58e339df6 100644 --- a/source3/passdb/ldap.c +++ b/source3/passdb/ldap.c @@ -893,25 +893,25 @@ static void endldappwent(void *vp) } /************************************************************************* - Return the current position in the ldap passwd list as an unsigned long. + Return the current position in the ldap passwd list as an SMB_BIG_INTEGER. This must be treated as an opaque token. do not call this function directly. use passdb.c instead. *************************************************************************/ -static unsigned long getldappwpos(void *vp) +static SMB_BIG_INTEGER getldappwpos(void *vp) { return 0; } /************************************************************************* - Set the current position in the ldap passwd list from unsigned long. + Set the current position in the ldap passwd list from SMB_BIG_INTEGER. This must be treated as an opaque token. do not call this function directly. use passdb.c instead. *************************************************************************/ -static BOOL setldappwpos(void *vp, unsigned long tok) +static BOOL setldappwpos(void *vp, SMB_BIG_INTEGER tok) { return False; } diff --git a/source3/passdb/nispass.c b/source3/passdb/nispass.c index d397f1bf40..50b7dd2a2e 100644 --- a/source3/passdb/nispass.c +++ b/source3/passdb/nispass.c @@ -223,25 +223,25 @@ static struct sam_passwd *getnisp21pwent(void *vp) } /************************************************************************* - Return the current position in the nisplus passwd list as an unsigned long. + Return the current position in the nisplus passwd list as an SMB_BIG_INTEGER. This must be treated as an opaque token. do not call this function directly. use passdb.c instead. *************************************************************************/ -static unsigned long getnisppwpos(void *vp) +static SMB_BIG_INTEGER getnisppwpos(void *vp) { return 0; } /************************************************************************* - Set the current position in the nisplus passwd list from unsigned long. + Set the current position in the nisplus passwd list from SMB_BIG_INTEGER. This must be treated as an opaque token. do not call this function directly. use passdb.c instead. *************************************************************************/ -static BOOL setnisppwpos(void *vp, unsigned long tok) +static BOOL setnisppwpos(void *vp, SMB_BIG_INTEGER tok) { return False; } diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c index f758b7bbc4..34de513476 100644 --- a/source3/passdb/smbpass.c +++ b/source3/passdb/smbpass.c @@ -399,23 +399,23 @@ static struct sam_passwd *getsmbfile21pwent(void *vp) } /************************************************************************* - Return the current position in the smbpasswd list as an unsigned long. + Return the current position in the smbpasswd list as an SMB_BIG_INTEGER This must be treated as an opaque token. *************************************************************************/ -static unsigned long getsmbfilepwpos(void *vp) +static SMB_BIG_INTEGER getsmbfilepwpos(void *vp) { - return (unsigned long)ftell((FILE *)vp); + return (SMB_BIG_INTEGER)sys_ftell((FILE *)vp); } /************************************************************************* - Set the current position in the smbpasswd list from unsigned long. + Set the current position in the smbpasswd list from an SMB_BIG_INTEGER. This must be treated as an opaque token. *************************************************************************/ -static BOOL setsmbfilepwpos(void *vp, unsigned long tok) +static BOOL setsmbfilepwpos(void *vp, SMB_BIG_INTEGER tok) { - return !fseek((FILE *)vp, tok, SEEK_SET); + return !sys_fseek((FILE *)vp, (SMB_OFF_T)tok, SEEK_SET); } /************************************************************************ @@ -609,7 +609,7 @@ static BOOL mod_smbfilepwd_entry(struct smb_passwd* pwd, BOOL override) * Scan the file, a line at a time and check if the name matches. */ while (!feof(fp)) { - pwd_seekpos = (SMB_OFF_T)ftell(fp); + pwd_seekpos = sys_ftell(fp); linebuf[0] = '\0'; diff --git a/source3/passdb/smbpassfile.c b/source3/passdb/smbpassfile.c index dcb69eb43a..8542ad081d 100644 --- a/source3/passdb/smbpassfile.c +++ b/source3/passdb/smbpassfile.c @@ -219,7 +219,7 @@ BOOL get_trust_account_password( unsigned char *ret_pwd, time_t *pass_last_set_t *pass_last_set_time = (time_t)0; memset(ret_pwd, '\0', 16); - if(fseek( mach_passwd_fp, 0L, SEEK_SET) == -1) { + if(sys_fseek( mach_passwd_fp, (SMB_OFF_T)0, SEEK_SET) == -1) { DEBUG(0,("get_trust_account_password: Failed to seek to start of file. Error was %s.\n", strerror(errno) )); return False; @@ -298,7 +298,7 @@ BOOL set_trust_account_password( unsigned char *md4_new_pwd) char linebuf[64]; int i; - if(fseek( mach_passwd_fp, 0L, SEEK_SET) == -1) { + if(sys_fseek( mach_passwd_fp, (SMB_OFF_T)0, SEEK_SET) == -1) { DEBUG(0,("set_trust_account_password: Failed to seek to start of file. Error was %s.\n", strerror(errno) )); return False; -- cgit