- fixed prototypes for slprintf() for broken systems

- fixed a cast warning in smbpass.c

diff --git a/source/include/proto.h b/source/include/proto.h
index 6ff0feb0dd70be212d1be8f90dc56e609f979e98..9c96a090fcfc11a15c69538cefedab93dc36508e 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1304,7 +1304,6 @@ struct shmem_ops *sysv_shm_open(int ronly);
 /*The following definitions come from  slprintf.c  */
 
 int vslprintf(char *str, int n, char *format, va_list ap);
-int slprintf(char *str, int n, char *format, ...);
 
 /*The following definitions come from  smbdes.c  */
 

diff --git a/source/include/smb.h b/source/include/smb.h
index 527160be2ad1d30f23dffc2749bf12c2d3ec6f2b..4e884ef769d4d86c6654143ef3179aedd476439c 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -847,8 +847,10 @@ struct connection_options {
 
 #ifdef __STDC__
 int Debug1(char *, ...);
+int slprintf(char *str, int n, char *format, ...);
 #else
 int Debug1();
+int slprintf();
 #endif
 
 #ifdef DFS_AUTH

diff --git a/source/lib/slprintf.c b/source/lib/slprintf.c
index 3a7e268046509e66be1b8cd7bbff5dc3d4a07cab..1d1805564379972e74e9f9e92a08441cb8137139 100644 (file)
--- a/source/lib/slprintf.c
+++ b/source/lib/slprintf.c
@@ -83,7 +83,7 @@ int vslprintf(char *str, int n, char *format, va_list ap)
 }
 
 #ifdef __STDC__
-int slprintf(char *str, int n, char *format, ...)
+ int slprintf(char *str, int n, char *format, ...)
 {
 #else
  int slprintf(va_alist)

diff --git a/source/passdb/smbpass.c b/source/passdb/smbpass.c
index bf61a564e8d1fc5c189a786bf1a30d6b4c1f0cdd..a6f58df87ed968aabb60cda0654b535a3c5f6ea2 100644 (file)
--- a/source/passdb/smbpass.c
+++ b/source/passdb/smbpass.c
@@ -364,7 +364,7 @@ BOOL add_smbpwd_entry(struct smb_passwd* pwd)
 
        int fd;
        int new_entry_length;
-       unsigned char *new_entry;
+       uchar *new_entry;
        long offpos;
 
        if (!*pfile)
@@ -501,7 +501,7 @@ Error was %s\n", pwd->smb_name, pfile, strerror(errno)));
 
        new_entry_length = strlen(pwd->smb_name) + 1 + 15 + 1 + 32 + 1 + 32 + 1 + 2;
 
-       if((new_entry = (char *)malloc( new_entry_length )) == 0)
+       if((new_entry = (uchar *)malloc( new_entry_length )) == 0)
        {
                DEBUG(0, ("add_smbpwd_entry(malloc): Failed to add entry for user %s to file %s. \
 Error was %s\n", 
@@ -512,8 +512,8 @@ Error was %s\n",
                return False;
        }
 
-       slprintf(new_entry, new_entry_length - 1, "%s:%u:", pwd->smb_name, (unsigned)pwd->smb_userid);
-       p = (unsigned char *)&new_entry[strlen(new_entry)];
+       slprintf((char *)new_entry, new_entry_length - 1, "%s:%u:", pwd->smb_name, (unsigned)pwd->smb_userid);
+       p = (unsigned char *)&new_entry[strlen((char *)new_entry)];
 
        for( i = 0; i < 16; i++)
        {
@@ -537,7 +537,7 @@ Error was %s\n",
                             fd, new_entry_length, strlen(new_entry), new_entry));
 #endif
 
-       if ((wr_len = write(fd, new_entry, strlen(new_entry))) != strlen(new_entry))
+       if ((wr_len = write(fd, new_entry, strlen(new_entry))) != strlen((char *)new_entry))
        {
                DEBUG(0, ("add_smbpwd_entry(write): %d Failed to add entry for user %s to file %s. \
 Error was %s\n", wr_len, pwd->smb_name, pfile, strerror(errno)));