Changeset 988 for vendor/current/source3/smbd/ntquotas.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/smbd/ntquotas.c (modified) (6 diffs)

vendor/current/source3/smbd/ntquotas.c

@@ -97 +97 @@
         }
 
-        ret = SMB_VFS_GET_QUOTA(fsp->conn, qtype, id, &D);
+        ret = SMB_VFS_GET_QUOTA(fsp->conn, ".", qtype, id, &D);
 
         if (psid)
@@ -177 +177 @@
         }
 
-        sys_setpwent();
-        while ((usr = sys_getpwent()) != NULL) {
+        setpwent();
+        while ((usr = getpwent()) != NULL) {
                 SMB_NTQUOTA_STRUCT tmp_qt;
                 SMB_NTQUOTA_LIST *tmp_list_ent;
@@ -202 +202 @@
                           sid_string_dbg(&sid), fsp->conn->connectpath));
 
-                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"));
                         *qt_list = NULL;
@@ -209 +209 @@
                 }
 
-                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"));
                         *qt_list = NULL;
@@ -223 +223 @@
                 
         }
-        sys_endpwent();
+        endpwent();
 
         return 0;
@@ -240 +240 @@
 
         if (!mem_ctx)
-                return False;
-
-        qt_handle = TALLOC_ZERO_P(mem_ctx,SMB_NTQUOTA_HANDLE);
+                return NULL;
+
+        qt_handle = talloc_zero(mem_ctx,SMB_NTQUOTA_HANDLE);
         if (qt_handle==NULL) {
                 DEBUG(0,("TALLOC_ZERO() failed\n"));