From a1c66b009ff2d6ac16b43f2af8eeaea67abb6414 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 4 Jun 1998 00:49:32 +0000 Subject: includes.h: Fixes for NetBSD and BSDI. smbpass.c: Fixed irix warnings. Jeremy. (This used to be commit 2caefb35ff56dba67968d04755d74238a38ba29d) --- source3/include/includes.h | 3 +++ source3/passdb/smbpass.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/include/includes.h b/source3/include/includes.h index 5054c2ee5b..74000a83ba 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -508,6 +508,7 @@ char *mktemp(char *); /* No standard include */ #include #define SIGNAL_CAST (void (*)()) #define USE_DIRECT +#define QSORT_CAST (int (*)(const void *, const void *)) #endif @@ -521,6 +522,8 @@ char *mktemp(char *); /* No standard include */ #include #endif /* NetBSD1_3 */ #include +#include +#include /* you may not need this */ #define NO_GETSPNAM #define SIGNAL_CAST (void (*)()) diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c index 003a1742e7..9c811a3728 100644 --- a/source3/passdb/smbpass.c +++ b/source3/passdb/smbpass.c @@ -475,7 +475,7 @@ Error was %s\n", newpwd->smb_name, pfile, strerror(errno))); new_entry_length = strlen(newpwd->smb_name) + 1 + 15 + 1 + 32 + 1 + 32 + 1 + 5 + 1 + 13 + 2; - if((new_entry = (unsigned char *)malloc( new_entry_length )) == NULL) { + if((new_entry = (char *)malloc( new_entry_length )) == NULL) { DEBUG(0, ("add_smbfilepwd_entry(malloc): Failed to add entry for user %s to file %s. \ Error was %s\n", newpwd->smb_name, pfile, strerror(errno))); endsmbfilepwent(fp); @@ -483,7 +483,7 @@ Error was %s\n", newpwd->smb_name, pfile, strerror(errno))); } slprintf(new_entry, new_entry_length - 1, "%s:%u:", newpwd->smb_name, (unsigned)newpwd->smb_userid); - p = (unsigned char *)&new_entry[strlen(new_entry)]; + p = &new_entry[strlen(new_entry)]; if(newpwd->smb_passwd != NULL) { for( i = 0; i < 16; i++) { -- cgit