Changeset 988 for vendor/current/source3/utils/smbcquotas.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/utils/smbcquotas.c (modified) (12 diffs)

vendor/current/source3/utils/smbcquotas.c

@@ -59 +59 @@
                 cli_ipc = connect_one("IPC$");
                 ret = cli_rpc_pipe_open_noauth(cli_ipc,
-                                               &ndr_table_lsarpc.syntax_id,
+                                               &ndr_table_lsarpc,
                                                &global_pipe_hnd);
                 if (!NT_STATUS_IS_OK(ret)) {
@@ -188 +188 @@
         switch (todo) {
                 case PARSE_LIM:
-                        if (sscanf(p,"%"PRIu64"/%"PRIu64,&pqt->softlim,&pqt->hardlim)!=2) {
+                        if (sscanf(p,"%"SCNu64"/%"SCNu64,&pqt->softlim,
+                            &pqt->hardlim) != 2)
+                        {
                                 return -1;
                         }
@@ -235 +237 @@
         const char *result;
 
-        if (!_numeric&&special&&(val == SMB_NTQUOTAS_NO_LIMIT)) {
+        if (!_numeric && special && val == 0) {
                 return "NO LIMIT";
         }
@@ -331 +333 @@
 static int do_quota(struct cli_state *cli,
                 enum SMB_QUOTA_TYPE qtype,
-                uint16 cmd,
+                uint16_t cmd,
                 const char *username_str,
                 SMB_NTQUOTA_STRUCT *pqt)
 {
-        uint32 fs_attrs = 0;
+        uint32_t fs_attrs = 0;
         uint16_t quota_fnum = 0;
         SMB_NTQUOTA_LIST *qtl = NULL;
@@ -505 +507 @@
 {
         struct cli_state *c;
-        struct sockaddr_storage ss;
         NTSTATUS nt_status;
         uint32_t flags = 0;
-
-        zero_sockaddr(&ss);
 
         if (get_cmdline_auth_info_use_machine_account(smbcquotas_auth_info) &&
@@ -524 +523 @@
         set_cmdline_auth_info_getpass(smbcquotas_auth_info);
 
-        nt_status = cli_full_connection(&c, global_myname(), server, 
-                                            &ss, 0,
+        nt_status = cli_full_connection(&c, lp_netbios_name(), server,
+                                            NULL, 0,
                                             share, "?????",
                                             get_cmdline_auth_info_username(smbcquotas_auth_info),
@@ -555 +554 @@
   main program
 ****************************************************************************/
- int main(int argc, const char *argv[])
-{
+int main(int argc, char *argv[])
+{
+        const char **argv_const = discard_const_p(const char *, argv);
         char *share;
         int opt;
@@ -584 +584 @@
                 { "numeric", 'n', POPT_ARG_NONE, NULL, 'n', "Don't resolve sids or limits to names" },
                 { "verbose", 'v', POPT_ARG_NONE, NULL, 'v', "be verbose" },
-                { "test-args", 't', POPT_ARG_NONE, NULL, 'r', "Test arguments"},
+                { "test-args", 't', POPT_ARG_NONE, NULL, 't', "Test arguments"},
                 POPT_COMMON_SAMBA
                 POPT_COMMON_CREDENTIALS
@@ -590 +590 @@
         };
 
-        load_case_tables();
+        smb_init_locale();
 
         ZERO_STRUCT(qt);
@@ -600 +600 @@
         setlinebuf(stdout);
 
-        fault_setup(NULL);
-
-        lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
+        fault_setup();
+
+        lp_load_global(get_dyn_CONFIGFILE());
         load_interfaces();
 
@@ -611 +611 @@
         popt_common_set_auth_info(smbcquotas_auth_info);
 
-        pc = poptGetContext("smbcquotas", argc, argv, long_options, 0);
+        pc = poptGetContext("smbcquotas", argc, argv_const, long_options, 0);
 
         poptSetOtherOptionHelp(pc, "//server1/share1");
@@ -692 +692 @@
         }
 
+        poptFreeContext(pc);
+        popt_burn_cmdline_password(argc, argv);
+
         string_replace(path, '/', '\\');