[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3947-g6579005

[Volker Lendecke]

The branch, v3-devel has been updated
       via  6579005e6490f1a99b3860627ba51decaeb864bd (commit)
       via  e6e8d108f95ed974f98f3f57adcfbbde4e00fad9 (commit)
      from  882297edc024c146f24fc9f847d2b0b813f93fc7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel


- Log -----------------------------------------------------------------
commit 6579005e6490f1a99b3860627ba51decaeb864bd
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 31 11:45:12 2008 +0200

    Remove a duplicate retval check
    
    Jeremy, please check!

commit e6e8d108f95ed974f98f3f57adcfbbde4e00fad9
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 31 11:34:01 2008 +0200

    Fix Coverity ID 592
    
    The scanner did not figure out that we always have a primary domain, so it
    complained about us potentially passing a NULL pointer down to
    set_domain_online_request() where it is dereferenced.
    
    Make the code a bit clearer.

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

Summary of changes:
 source/libsmb/clikrb5.c         |   10 ++--------
 source/winbindd/winbindd_dual.c |    4 ++++
 2 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index bedd7d7..f940081 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -749,16 +749,10 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context,
 						ccache,
 						&in_data );
 		if (retval) {
-			DEBUG( 1, ("ads_krb5_get_fwd_ticket failed (%s)\n", error_message( retval ) ) );
+			DEBUG( 1, ("ads_krb5_get_fwd_ticket failed (%s)\n",
+				   error_message( retval ) ) );
 			goto cleanup_creds;
 		}
-
-		if (retval) {
-			DEBUG( 1, ("krb5_auth_con_set_req_cksumtype failed (%s)\n",
-				error_message( retval ) ) );
-			goto cleanup_creds;
-		}
-
 	}
 #endif
 
diff --git a/source/winbindd/winbindd_dual.c b/source/winbindd/winbindd_dual.c
index 916e8c0..63ce0e8 100644
--- a/source/winbindd/winbindd_dual.c
+++ b/source/winbindd/winbindd_dual.c
@@ -1212,6 +1212,10 @@ static bool fork_domain_child(struct winbindd_child *child)
 		}
 	}
 
+	if (primary_domain == NULL) {
+		smb_panic("no primary domain found");
+	}
+
 	/* Ensure we're not handling an event inherited from
 	   our parent. */
 


-- 
Samba Shared Repository