Changeset 988 for vendor/current/source3/lib/netapi/user.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/lib/netapi/user.c (modified) (22 diffs)

vendor/current/source3/lib/netapi/user.c

@@ -69 +69 @@
         }
         if (infoX->usriX_password_age) {
-                fields_present |= SAMR_FIELD_FORCE_PWD_CHANGE;
+                fields_present |= SAMR_FIELD_;
         }
         if (infoX->usriX_full_name) {
@@ -401 +401 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -553 +553 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
 
@@ -576 +576 @@
                                         &connect_handle,
                                         SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-                                        CONST_DISCARD(struct dom_sid *, &global_sid_Builtin),
+                                        , &global_sid_Builtin),
                                         &builtin_handle,
                                         &result);
@@ -1202 +1202 @@
 
         switch (level) {
-                case 0:
-                        /* already returned above */
-                        break;
                 case 1:
                         status = info21_to_USER_INFO_1(mem_ctx, info21, &info1);
@@ -1323 +1320 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -1445 +1442 @@
         int i;
 
-        user = TALLOC_ZERO_ARRAY(mem_ctx,
+        user = (mem_ctx,
                                  struct NET_DISPLAY_USER,
                                  info->count);
@@ -1489 +1486 @@
         int i;
 
-        machine = TALLOC_ZERO_ARRAY(mem_ctx,
+        machine = (mem_ctx,
                                     struct NET_DISPLAY_MACHINE,
                                     info->count);
@@ -1531 +1528 @@
         int i;
 
-        group = TALLOC_ZERO_ARRAY(mem_ctx,
+        group = (mem_ctx,
                                   struct NET_DISPLAY_GROUP,
                                   info->count);
@@ -1631 +1628 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -1765 +1762 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -1905 +1902 @@
                 case 1024:
                         user_mask = SAMR_USER_ACCESS_SET_LOC_COM;
+
                 case 1051:
                         user_mask = SAMR_USER_ACCESS_SET_ATTRIBUTES |
@@ -1936 +1934 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -2395 +2393 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -2880 +2878 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -3015 +3013 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -3178 +3176 @@
 
         uint32_t *member_rids = NULL;
-        size_t num_member_rids = 0;
 
         struct GROUP_USERS_INFO_0 *i0 = NULL;
@@ -3192 +3189 @@
         ZERO_STRUCT(connect_handle);
         ZERO_STRUCT(domain_handle);
+
 
         if (!r->in.buffer) {
@@ -3206 +3204 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -3320 +3318 @@
 
         member_rids = group_rids.ids;
-        num_member_rids = group_rids.count;
 
         status = dcerpc_samr_GetGroupsForUser(b, talloc_tos(),
@@ -3548 +3545 @@
 
         werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_samr.syntax_id,
+                                   &ndr_table_samr,
                                    &pipe_cli);
         if (!W_ERROR_IS_OK(werr)) {
@@ -3639 +3636 @@
 
         sid_array.num_sids = rid_array->count + 1;
-        sid_array.sids = TALLOC_ARRAY(ctx, struct lsa_SidPtr, sid_array.num_sids);
+        sid_array.sids = (ctx, struct lsa_SidPtr, sid_array.num_sids);
         if (!sid_array.sids) {
                 werr = WERR_NOMEM;