Changeset 988 for vendor/current/source3/libsmb/cliquota.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/cliquota.c (modified) (10 diffs)

vendor/current/source3/libsmb/cliquota.c

@@ -30 +30 @@
                  0x00000016, DESIRED_ACCESS_PIPE,
                  0x00000000, FILE_SHARE_READ|FILE_SHARE_WRITE,
-                 FILE_OPEN, 0x00000000, 0x03, quota_fnum);
+                 FILE_OPEN, 0x00000000, 0x03, quota_fnum, NULL);
 }
 
@@ -90 +90 @@
         qt.hardlim = BVAL(rdata,32);
 
-        if (!sid_parse((char *)rdata+40,sid_len,&qt.sid)) {
+        if (!sid_parse(rdata+40,sid_len,&qt.sid)) {
                 return false;
         }
@@ -130 +130 @@
         SIVAL(data, 0, 0x00000000);
         SIVAL(data, 4, sid_len);
-        sid_linearize((char *)data+8, sid_len, &pqt->sid);
+        sid_linearize(data+8, sid_len, &pqt->sid);
 
         status = cli_trans(talloc_tos(), cli, SMBnttrans,
@@ -184 +184 @@
         SBIG_UINT(data,24,pqt->softlim);
         SBIG_UINT(data,32,pqt->hardlim);
-        sid_linearize((char *)data+40, sid_len, &pqt->sid);
+        sid_linearize(data+40, sid_len, &pqt->sid);
 
         status = cli_trans(talloc_tos(), cli, SMBnttrans,
@@ -264 +264 @@
                 curdata +=offset,curdata_count -= offset) {
                 ZERO_STRUCT(qt);
-                if (!parse_user_quota_record((uint8_t *)curdata, curdata_count,
+                if (!parse_user_quota_record((const uint8_t *)curdata, curdata_count,
                                              &offset, &qt)) {
                         DEBUG(1,("Failed to parse the quota record\n"));
@@ -270 +270 @@
                 }
 
-                if ((tmp_list_ent=TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_LIST))==NULL) {
+                if ((tmp_list_ent=talloc_zero(mem_ctx,SMB_NTQUOTA_LIST))==NULL) {
                         DEBUG(0,("TALLOC_ZERO() failed\n"));
                         talloc_destroy(mem_ctx);
@@ -276 +276 @@
                 }
 
-                if ((tmp_list_ent->quotas=TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_STRUCT))==NULL) {
+                if ((tmp_list_ent->quotas=talloc_zero(mem_ctx,SMB_NTQUOTA_STRUCT))==NULL) {
                         DEBUG(0,("TALLOC_ZERO() failed\n"));
                         talloc_destroy(mem_ctx);
@@ -320 +320 @@
                         curdata +=offset,curdata_count -= offset) {
                         ZERO_STRUCT(qt);
-                        if (!parse_user_quota_record((uint8_t *)curdata,
+                        if (!parse_user_quota_record((const uint8_t *)curdata,
                                                      curdata_count, &offset,
                                                      &qt)) {
@@ -327 +327 @@
                         }
 
-                        if ((tmp_list_ent=TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_LIST))==NULL) {
+                        if ((tmp_list_ent=talloc_zero(mem_ctx,SMB_NTQUOTA_LIST))==NULL) {
                                 DEBUG(0,("TALLOC_ZERO() failed\n"));
                                 talloc_destroy(mem_ctx);
@@ -333 +333 @@
                         }
 
-                        if ((tmp_list_ent->quotas=TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_STRUCT))==NULL) {
+                        if ((tmp_list_ent->quotas=talloc_zero(mem_ctx,SMB_NTQUOTA_STRUCT))==NULL) {
                                 DEBUG(0,("TALLOC_ZERO() failed\n"));
                                 talloc_destroy(mem_ctx);