Changeset 988 for vendor/current/source3/libsmb/clirap2.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/libsmb/clirap2.c (modified) (21 diffs)

vendor/current/source3/libsmb/clirap2.c

@@ -81 +81 @@
 #include "../librpc/gen_ndr/svcctl.h"
 #include "libsmb/clirap.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 #define WORDSIZE 2
@@ -218 +219 @@
 }
 
-static char *make_header(char *param, uint16 apinum, const char *reqfmt, const char *datafmt)
+static char *make_header(char *param, uint16_t apinum, const char *reqfmt, const char *datafmt)
 {
         PUTWORD(param,apinum);
@@ -867 +868 @@
         PUTWORD(p, 1); /* info level */
         PUTWORD(p, 0); /* pwencrypt */
-        if(userinfo->passwrd)
-                PUTWORD(p,MIN(strlen((const char *)userinfo->passwrd), RAP_UPASSWD_LEN));
-        else
-                PUTWORD(p, 0); /* password length */
+        PUTWORD(p, MIN(strlen((const char *)userinfo->passwrd),
+                       RAP_UPASSWD_LEN));
 
         p = data;
@@ -1099 +1098 @@
 ****************************************************************************/
 
-int cli_NetFileClose(struct cli_state *cli, uint32 file_id )
+int cli_NetFileClose(struct cli_state *cli, uint32_t file_id )
 {
         char *rparam = NULL;
@@ -1127 +1126 @@
                         /* nothing to do */
                 } else if (res == 2314){
-                        DEBUG(1, ("NetFileClose2 - attempt to close non-existant file open instance\n"));
+                        DEBUG(1, ("NetFileClose2 - attempt to close non-existent file open instance\n"));
                 } else {
                         DEBUG(4,("NetFileClose2 res=%d\n", res));
@@ -1147 +1146 @@
 ****************************************************************************/
 
-int cli_NetFileGetInfo(struct cli_state *cli, uint32 file_id, void (*fn)(const char *, const char *, uint16, uint16, uint32))
+int cli_NetFileGetInfo(struct cli_state *cli, uint32_t file_id, void (*fn)(const char *, const char *, uint16_t, uint16_t, uint32_t))
 {
         char *rparam = NULL;
@@ -1247 +1246 @@
 int cli_NetFileEnum(struct cli_state *cli, const char * user,
                     const char * base_path,
-                    void (*fn)(const char *, const char *, uint16, uint16,
-                               uint32))
+                    void (*fn)(const char *, const char *, uint16_t, uint16_t,
+                               uint32_t))
 {
         char *rparam = NULL;
@@ -1534 +1533 @@
                         }
                 } else {
-                        DEBUG(4,("cli_get_pdc_name: machine %s failed the NetServerEnum call. "
-                                "Error was : %s.\n", cli->desthost, cli_errstr(cli) ));
+                        DEBUG(4, ("cli_get_pdc_name: machine %s failed the "
+                                  "NetServerEnum call. Error was : %s.\n",
+                                  smbXcli_conn_remote_name(cli->conn),
+                                  win_errstr(W_ERROR(cli->rap_error))));
                 }
         }
@@ -1636 +1637 @@
 * Parameters:
 *             cli       - pointer to cli_state structure
-*             pstype    - pointer to uint32 to contain returned server type
+*             pstype    - pointer to uint32_t to contain returned server type
 *
 * Returns:
@@ -1646 +1647 @@
 ************************************************************************/
 
-bool cli_get_server_type(struct cli_state *cli, uint32 *pstype)
+bool cli_get_server_type(struct cli_state *cli, uint32_t *pstype)
 {
         char *rparam = NULL;
@@ -1755 +1756 @@
 *           requesting server_info_0 level information of machines
 *           matching the given server type. If the returned server
-*           list contains the machine name contained in cli->desthost
+*           list contains the machine name contained in smbXcli_conn_remote_name(->conn)
 *           then we conclude the server type checks out. This routine
 *           is useful to retrieve list of server's of a certain
@@ -1775 +1776 @@
 ************************************************************************/
 
-bool cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 stype)
+bool cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32_t stype)
 {
         char *rparam = NULL;
@@ -1790 +1791 @@
         bool found_server = false;
         int res = -1;
+        const char *remote_name = smbXcli_conn_remote_name(cli->conn);
 
         /* send a SMBtrans command with api NetServerEnum */
@@ -1825 +1827 @@
                                                 RAP_MACHNAME_LEN,
                                                 endp);
-                                if (strequal(ret_server, cli->desthost)) {
+                                if (strequal(ret_server, remote_name)) {
                                         found_server = true;
                                         break;
@@ -1831 +1833 @@
                         }
                 } else {
-                        DEBUG(4,("cli_ns_check_server_type: machine %s failed the NetServerEnum call. "
-                                "Error was : %s.\n", cli->desthost, cli_errstr(cli) ));
+                        DEBUG(4, ("cli_ns_check_server_type: machine %s "
+                                  "failed the NetServerEnum call. Error was : "
+                                  "%s.\n", remote_name,
+                                  win_errstr(W_ERROR(cli->rap_error))));
                 }
         }
@@ -1871 +1875 @@
         PUTDWORD(p, 0); /* Null pointer */
         strlcpy(upperbuf, user, sizeof(upperbuf));
-        strupper_m(upperbuf);
+        if (!strupper_m(upperbuf)) {
+                return false;
+        }
         tmp = upperbuf;
         PUTSTRINGF(p, tmp, RAP_USERNAME_LEN);
         p++; /* strange format, but ok */
         strlcpy(upperbuf, workstation, sizeof(upperbuf));
-        strupper_m(upperbuf);
+        if (!strupper_m(upperbuf)) {
+                return false;
+        }
         tmp = upperbuf;
         PUTSTRINGF(p, tmp, RAP_MACHNAME_LEN);
@@ -1903 +1911 @@
 
 int cli_NetPrintQEnum(struct cli_state *cli,
-                void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
-                void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*))
+                void (*qfn)(const char*,uint16_t,uint16_t,uint16_t,const char*,const char*,const char*,const char*,const char*,uint16_t,uint16_t),
+                void (*jfn)(uint16_t,const char*,const char*,const char*,const char*,uint16_t,uint16_t,const char*,unsigned int,unsigned int,const char*))
 {
         char param[WORDSIZE                         /* api number    */
@@ -2011 +2019 @@
                                 int j;
                                 for (j=0;j<jobcount;j++) {
-                                        uint16 jid = 0, pos = 0, fsstatus = 0;
+                                        uint16_t jid = 0, pos = 0, fsstatus = 0;
                                         char ownername[RAP_USERNAME_LEN];
                                         char notifyname[RAP_MACHNAME_LEN];
@@ -2079 +2087 @@
 
 int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
-        void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
-        void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*))
+        void (*qfn)(const char*,uint16_t,uint16_t,uint16_t,const char*,const char*,const char*,const char*,const char*,uint16_t,uint16_t),
+        void (*jfn)(uint16_t,const char*,const char*,const char*,const char*,uint16_t,uint16_t,const char*,unsigned int,unsigned int,const char*))
 {
         char param[WORDSIZE                         /* api number    */
@@ -2340 +2348 @@
 ****************************************************************************/
 
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, char *))
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16_t, uint16_t, uint16_t, unsigned int, unsigned int, unsigned int, char *))
 {
         char param[WORDSIZE                       /* api number    */
@@ -2440 +2448 @@
 
 int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
-                void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, const char *))
+                void (*fn)(const char *, const char *, uint16_t, uint16_t, uint16_t, unsigned int, unsigned int, unsigned int, const char *))
 {
         char param[WORDSIZE                          /* api number    */