[SCM] Samba Shared Repository - branch master updated

Kamen Mazdrashki kamenim at samba.org
Sun Apr 11 17:06:06 MDT 2010


The branch, master has been updated
       via  2179c6a... s4: fix a typo
       via  a62d041... s4/libnet: handle errors returned for DsAddEntry_v3 properly
       via  cb0ad42... s4/libnet: Add few new lines in the debug log so it is readable again
       via  9f92d58... s4/libnet: Dump DRSUAPI_DIRERR_OK as unexpected
      from  8e95db9... s3: Move serverinfo_to_SamInfoX to auth/server_info.c

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2179c6a8f843d9db5860b6c91d154d288f28d741
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun Apr 11 18:43:56 2010 +0300

    s4: fix a typo

commit a62d0419dee3d3fe8618baa71aa882c5bed54072
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun Apr 11 17:27:30 2010 +0300

    s4/libnet: handle errors returned for DsAddEntry_v3 properly
    
    It turns out ms-docs are little bit misleading - in case of
    no error, r->out.ctr->ctr3.err_data is not NULL, but
    error information (r->out.ctr->ctr3.err_data->v1.info) is NULL!

commit cb0ad42a3d9d837cfc06f65baa6d8fa2d28a3ec9
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun Apr 11 17:24:32 2010 +0300

    s4/libnet: Add few new lines in the debug log so it is readable again

commit 9f92d586ca537ed093a1d68eacf94315da68a8ad
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Sun Apr 11 17:04:21 2010 +0300

    s4/libnet: Dump DRSUAPI_DIRERR_OK as unexpected
    
    Actually DRSUAPI_DIRERR_OK is not valid error to be returned.
    I introduce it in the IDL so that I can use it in enum.
    So it should be dumped as Unexpected error code

-----------------------------------------------------------------------

Summary of changes:
 source4/libnet/libnet_become_dc.c |   40 ++++++++++++++++++------------------
 source4/param/provision.c         |    2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index 1c0bfbc..486416e 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -2285,11 +2285,12 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 	}
 
 	if (*r->out.level_out == 3) {
+		WERROR status;
 		union drsuapi_DsAddEntry_ErrData *err_data = r->out.ctr->ctr3.err_data;
 
 		/* check for errors */
-		if (err_data) {
-			WERROR status;
+		status = err_data ? err_data->v1.status : WERR_OK;
+		if (!W_ERROR_IS_OK(status)) {
 			struct drsuapi_DsAddEntryErrorInfo_Attr_V1 *attr_err;
 			struct drsuapi_DsAddEntry_AttrErrListItem_V1 *attr_err_li;
 			struct drsuapi_DsAddEntryErrorInfo_Name_V1 *name_err;
@@ -2301,32 +2302,30 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 				return;
 			}
 
-			status = err_data->v1.status;
-
 			DEBUG(0,("DsAddEntry (R3) failed: "
-				 "Errors: dir_err = %d, status = %s;",
+				 "Errors: dir_err = %d, status = %s;\n",
 				 err_data->v1.dir_err,
 				 win_errstr(err_data->v1.status)));
 
 			if (!err_data->v1.info) {
+				DEBUG(0, ("DsAddEntry (R3): no error info returned!\n",
+					  err_data->v1.info));
 				composite_error(c, werror_to_ntstatus(status));
 				return;
 			}
 
 			/* dump more detailed error */
 			switch (err_data->v1.dir_err) {
-			case DRSUAPI_DIRERR_OK: /* mute compiler warnings */
-				break;
 			case DRSUAPI_DIRERR_ATTRIBUTE:
 				/* Dump attribute errors */
 				attr_err = &err_data->v1.info->attr_err;
-				DEBUGADD(0,(" Attribute Error: object = %s, count = %d;",
+				DEBUGADD(0,(" Attribute Error: object = %s, count = %d;\n",
 					    attr_err->id->dn,
 					    attr_err->count));
 				attr_err_li = &attr_err->first;
 				for (; attr_err_li; attr_err_li = attr_err_li->next) {
 					struct drsuapi_DsAddEntry_AttrErr_V1 *err = &attr_err_li->err_data;
-					DEBUGADD(0,(" Error: err = %s, problem = 0x%08X, attid = 0x%08X;",
+					DEBUGADD(0,(" Error: err = %s, problem = 0x%08X, attid = 0x%08X;\n",
 						    win_errstr(err->extended_err),
 						    err->problem,
 						    err->attid));
@@ -2336,7 +2335,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 			case DRSUAPI_DIRERR_NAME:
 				/* Dump Name resolution error */
 				name_err = &err_data->v1.info->name_err;
-				DEBUGADD(0,(" Name Error: err = %s, problem = 0x%08X, id_matched = %s;",
+				DEBUGADD(0,(" Name Error: err = %s, problem = 0x%08X, id_matched = %s;\n",
 					    win_errstr(name_err->extended_err),
 					    name_err->problem,
 					    name_err->id_matched->dn));
@@ -2344,7 +2343,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 			case DRSUAPI_DIRERR_REFERRAL:
 				/* Dump Referral errors */
 				ref_err = &err_data->v1.info->referral_err;
-				DEBUGADD(0,(" Referral Error: extended_err = %s",
+				DEBUGADD(0,(" Referral Error: extended_err = %s\n",
 					    win_errstr(name_err->extended_err)));
 				ref_li = &ref_err->refer;
 				for (; ref_li; ref_li = ref_li->next) {
@@ -2363,35 +2362,36 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 							DEBUGADD(0,(", "));
 						}
 					}
-					DEBUGADD(0,(");"));
+					DEBUGADD(0,(");\n"));
 				}
 				break;
 			case DRSUAPI_DIRERR_SECURITY:
 				/* Dump Security error. */
-				DEBUGADD(0,(" Security Error: extended_err = %s, problem = 0x%08X",
+				DEBUGADD(0,(" Security Error: extended_err = %s, problem = 0x%08X\n",
 					    win_errstr(err_data->v1.info->security_err.extended_err),
 					    err_data->v1.info->security_err.problem));
 				break;
 			case DRSUAPI_DIRERR_SERVICE:
 				/* Dump Service error. */
-				DEBUGADD(0,(" Service Error: extended_err = %s, problem = 0x%08X",
+				DEBUGADD(0,(" Service Error: extended_err = %s, problem = 0x%08X\n",
 					    win_errstr(err_data->v1.info->service_err.extended_err),
 					    err_data->v1.info->service_err.problem));
 				break;
 			case DRSUAPI_DIRERR_UPDATE:
 				/* Dump Update error. */
-				DEBUGADD(0,(" Update Error: extended_err = %s, problem = 0x%08X",
+				DEBUGADD(0,(" Update Error: extended_err = %s, problem = 0x%08X\n",
 					    win_errstr(err_data->v1.info->update_err.extended_err),
 					    err_data->v1.info->update_err.problem));
 				break;
 			case DRSUAPI_DIRERR_SYSTEM:
 				/* System error. */
-				DEBUGADD(0,(" System Error: extended_err = %s, problem = 0x%08X",
+				DEBUGADD(0,(" System Error: extended_err = %s, problem = 0x%08X\n",
 					    win_errstr(err_data->v1.info->system_err.extended_err),
 					    err_data->v1.info->system_err.problem));
 				break;
+			case DRSUAPI_DIRERR_OK: /* mute compiler warnings */
 			default:
-				DEBUGADD(0,(" Unknown DIRERR error class returned!"));
+				DEBUGADD(0,(" Unknown DIRERR error class returned!\n"));
 				break;
 			}
 
@@ -2401,7 +2401,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 
 		if (1 != r->out.ctr->ctr3.count) {
 			DEBUG(0,("DsAddEntry - Ctr3: something very wrong had happened - "
-				 "method succeeded but objects returned are %d (expected 1). ",
+				 "method succeeded but objects returned are %d (expected 1).\n",
 				 r->out.ctr->ctr3.count));
 			composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE);
 		}
@@ -2410,7 +2410,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 
 	} else if (*r->out.level_out == 2) {
 		if (DRSUAPI_DIRERR_OK != r->out.ctr->ctr2.dir_err) {
-			DEBUG(0,("DsAddEntry failed with: dir_err = %d, extended_err = %s",
+			DEBUG(0,("DsAddEntry failed with: dir_err = %d, extended_err = %s\n",
 				 r->out.ctr->ctr2.dir_err,
 				 win_errstr(r->out.ctr->ctr2.extended_err)));
 			composite_error(c, werror_to_ntstatus(r->out.ctr->ctr2.extended_err));
@@ -2420,7 +2420,7 @@ static void becomeDC_drsuapi1_add_entry_recv(struct tevent_req *subreq)
 		if (1 != r->out.ctr->ctr2.count) {
 			DEBUG(0,("DsAddEntry: something very wrong had happened - "
 				 "method succeeded but objects returned are %d (expected 1). "
-				 "Errors: dir_err = %d, extended_err = %s",
+				 "Errors: dir_err = %d, extended_err = %s\n",
 				 r->out.ctr->ctr2.count,
 				 r->out.ctr->ctr2.dir_err,
 				 win_errstr(r->out.ctr->ctr2.extended_err)));
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 1e518ff..91260c6 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -123,7 +123,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
 		settings->ntds_dn_str,
 		settings->invocation_id == NULL?"None":GUID_string(mem_ctx, settings->invocation_id)));
 
-	DEBUG(0,("Pathes under targetdir[%s]\n",
+	DEBUG(0,("Paths under targetdir[%s]\n",
 		 settings->targetdir));
 	parameters = PyDict_New();
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list