Don't use uint. It doesn't exist on some platforms and we don't define it.

Replaced with "unsigned int".
Jeremy.

diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
index e343b876d339c306d9f51fe6f9c3ce71335d0d4e..134d6578f15a2a2388be06e0f4b6a39492698e0f 100644 (file)
--- a/source/include/libsmbclient.h
+++ b/source/include/libsmbclient.h
@@ -93,22 +93,22 @@ struct smbc_dirent
            SMBC_DIR=7,
            SMBC_FILE=8,
            SMBC_LINK=9,*/ 
-       uint smbc_type; 
+       unsigned int smbc_type; 
 
        /** Length of this smbc_dirent in bytes
         */
-       uint dirlen;
+       unsigned int dirlen;
        /** The length of the comment string in bytes (includes null 
         *  terminator)
         */
-       uint commentlen;
+       unsigned int commentlen;
        /** Points to the null terminated comment string 
         */
        char *comment;
        /** The length of the name string in bytes (includes null 
         *  terminator)
         */
-       uint namelen;
+       unsigned int namelen;
        /** Points to the null terminated name string 
         */
        char name[1];

diff --git a/source/libsmb/cli_samr.c b/source/libsmb/cli_samr.c
index dfc4ccf70608d7eaeb3198d77d3965221bc34012..91577b33256098fcb3e95ea988e9030fa53f46d7 100644 (file)
--- a/source/libsmb/cli_samr.c
+++ b/source/libsmb/cli_samr.c
@@ -407,7 +407,7 @@ NTSTATUS cli_samr_query_useraliases(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        SAMR_Q_QUERY_USERALIASES q;
        SAMR_R_QUERY_USERALIASES r;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint ptr=1;
+       unsigned int ptr=1;
        
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);

diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 893d194a87ac1d80068b986d678c29f342ceaef9..cc9821dc29a618be9e97201de18898ec1d24e1a6 100644 (file)
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -634,10 +634,12 @@ BOOL cli_session_setup(struct cli_state *cli,
                return cli_session_setup_plaintext(cli, user, pass, workgroup);
        }
 
+#if 0 /* JRATEST for signing. */
        /* if the server supports extended security then use SPNEGO */
        if (cli->capabilities & CAP_EXTENDED_SECURITY) {
                return cli_session_setup_spnego(cli, user, pass, workgroup);
        }
+#endif
 
        /* otherwise do a NT1 style session setup */
        return cli_session_setup_nt1(cli, user, 
@@ -822,6 +824,10 @@ BOOL cli_negprot(struct cli_state *cli)
                cli->use_spnego = False;
        }
 
+#if 1 /* JRA SIGN TEST */
+       cli->use_spnego = False;
+#endif
+
        memset(cli->outbuf,'\0',smb_size);
 
        /* setup the protocol strings */
@@ -886,8 +892,10 @@ BOOL cli_negprot(struct cli_state *cli)
                if (getenv("CLI_FORCE_SMB_SIGNING"))
                        cli->sign_info.negotiated_smb_signing = True;
                                    
+#if 0
                if (cli->sign_info.negotiated_smb_signing && !(cli->sec_mode & NEGOTIATE_SECURITY_SIGNATURES_ENABLED))
                        cli->sign_info.negotiated_smb_signing = False;
+#endif
 
        } else if (cli->protocol >= PROTOCOL_LANMAN1) {
                cli->use_spnego = False;

diff --git a/source/libsmb/clifile.c b/source/libsmb/clifile.c
index 05843ac5de1e31b990456a13c7c81c000223aedd..a47c956a55541b2ed34fad5982fb4c9f867dba49 100644 (file)
--- a/source/libsmb/clifile.c
+++ b/source/libsmb/clifile.c
@@ -76,7 +76,7 @@ static BOOL cli_link_internal(struct cli_state *cli, const char *fname_src, cons
 
 uint32  unix_perms_to_wire(mode_t perms)
 {
-        uint ret = 0;
+        unsigned int ret = 0;
 
         ret |= ((perms & S_IXOTH) ?  UNIX_X_OTH : 0);
         ret |= ((perms & S_IWOTH) ?  UNIX_W_OTH : 0);

diff --git a/source/libsmb/clirap2.c b/source/libsmb/clirap2.c
index 00cd4b15f331e4ee2bc8f342b3da4eb20ebd6daa..9c3ec212d52eba63f4103dd7bc08fe926eaba1ad 100644 (file)
--- a/source/libsmb/clirap2.c
+++ b/source/libsmb/clirap2.c
@@ -1493,7 +1493,7 @@ int cli_NetPrintQEnum(struct cli_state *cli,
          for (j=0;j<jobcount;j++) {
            uint16 jid, pos, fsstatus;
            pstring ownername, notifyname, datatype, jparms, jstatus, jcomment;
-           uint submitted, jsize;
+           unsigned int submitted, jsize;
            
            GETWORD(p, jid);
            GETSTRINGF(p, ownername, RAP_USERNAME_LEN);
@@ -1594,7 +1594,7 @@ int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
        for (j=0;(j<jobcount)&&(PTR_DIFF(p,rdata)< rsize);j++) {
          uint16 jid, pos, fsstatus;
          pstring ownername, notifyname, datatype, jparms, jstatus, jcomment;
-         uint submitted, jsize;
+         unsigned int submitted, jsize;
 
          GETWORD(p, jid);
          GETSTRINGF(p, ownername, RAP_USERNAME_LEN);
@@ -1740,7 +1740,7 @@ int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16,
       for (i=0,p=rdata;i<count;i++) {
        pstring wsname, username, clitype_name;
        uint16  num_conns, num_opens, num_users;
-       uint    sess_time, idle_time, user_flags;
+       unsigned int    sess_time, idle_time, user_flags;
 
        GETSTRINGP(p, wsname, rdata, converter);
        GETSTRINGP(p, username, rdata, converter);
@@ -1813,7 +1813,7 @@ int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation, void (
       int rsize, converter;
       pstring wsname, username, clitype_name;
       uint16  num_conns, num_opens, num_users;
-      uint    sess_time, idle_time, user_flags;
+      unsigned int    sess_time, idle_time, user_flags;
 
       p = rparam + WORDSIZE;
       GETWORD(p, converter);
@@ -1935,7 +1935,7 @@ int cli_NetConnectionEnum(struct cli_state *cli, const char *qualifier, void (*f
       for (i=0,p=rdata;i<count;i++) {
        pstring netname, username;
        uint16  conn_id, conn_type, num_opens, num_users;
-       uint    conn_time;
+       unsigned int    conn_time;
 
        GETWORD(p,conn_id);
        GETWORD(p,conn_type);

diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
index f64140daf81ee7ec2018498f4494c7da5c6108b2..3eca6695d22b0d2b99126af82f3d18c291a83664 100644 (file)
--- a/source/smbd/lanman.c
+++ b/source/smbd/lanman.c
@@ -1670,7 +1670,7 @@ static BOOL api_RNetShareAdd(connection_struct *conn,uint16 vuid, char *param,ch
   fstring comment;
   pstring pathname;
   char *command, *cmdname;
-  uint offset;
+  unsigned int offset;
   int snum;
   int res = ERRunsup;
   

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index efb0864a11cc266094e7ffb406a049fd6a795a3a..8780c17699ad29dc86a1a85fbe51eafdc7f16cef 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -375,7 +375,7 @@ static uint32 unix_dev_minor(SMB_DEV_T dev)
 
 static uint32  unix_perms_to_wire(mode_t perms)
 {
-       uint ret = 0;
+       unsigned int ret = 0;
 
        ret |= ((perms & S_IXOTH) ?  UNIX_X_OTH : 0);
        ret |= ((perms & S_IWOTH) ?  UNIX_W_OTH : 0);

diff --git a/source/utils/net_rap.c b/source/utils/net_rap.c
index b9eac1f0775a515bb7c178cb31f98d1931a50229..af0a6adbd29cb66f81f55f91e0c9f74f7f4536c1 100644 (file)
--- a/source/utils/net_rap.c
+++ b/source/utils/net_rap.c
@@ -494,7 +494,7 @@ static void enum_queue(const char *queuename, uint16 pri, uint16 start,
 static void enum_jobs(uint16 jobid, const char *ownername, 
                      const char *notifyname, const char *datatype,
                      const char *jparms, uint16 pos, uint16 status, 
-                     const char *jstatus, uint submitted, uint jobsize, 
+                     const char *jstatus, unsigned int submitted, unsigned int jobsize, 
                      const char *comment)
 {
        d_printf("     %-23.23s %5d %9d            ",