X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source4%2Fdsdb%2Fsamdb%2Fldb_modules%2Fpassword_hash.c;h=553cd686a4bb707eccac419bea9232cfc3f2541e;hb=13182e792a78c4b32eea95f14c3bc84ca340ef72;hp=bf94ba3dc328744f68443b5e0fac643cfa7c6f39;hpb=189ee922263a2acab65cd24483c75f2aaad26a36;p=metze%2Fsamba%2Fwip.git

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index bf94ba3dc328..553cd686a4bb 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -301,6 +301,22 @@ static int password_hash_bypass(struct ldb_module *module, struct ldb_request *r
 			data_blob_free(&subblob);
 		}
 
+		if (scpp == NULL) {
+			return ldb_error(ldb,
+					 LDB_ERR_CONSTRAINT_VIOLATION,
+					 "Primary:Packages missing");
+		}
+
+		if (scpk == NULL) {
+			/*
+			 * If Primary:Kerberos is missing w2k8r2 reboots
+			 * when a password is changed.
+			 */
+			return ldb_error(ldb,
+					 LDB_ERR_CONSTRAINT_VIOLATION,
+					 "Primary:Kerberos missing");
+		}
+
 		if (scpp) {
 			struct package_PackagesBlob *p;
 			uint32_t n;