The branch, master has been updated
via 373d58c s3-libads: remove unused dn from
ads_get_service_principal_names().
via 8ce7904 ntdb: Fix control reaches end of non-void function.
from 5747507 torture: Fix raw.open.chained-openx
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 373d58c91d6cba1e6e67a067c2ba60e507424b4d
Author: Günther Deschner <[email protected]>
Date: Fri Nov 14 13:21:43 2014 +0100
s3-libads: remove unused dn from ads_get_service_principal_names().
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Günther Deschner <[email protected]>
Autobuild-Date(master): Fri Nov 28 16:46:20 CET 2014 on sn-devel-104
commit 8ce7904abd29b1bf01a7a040871bb31b844089d8
Author: Andreas Schneider <[email protected]>
Date: Tue Nov 18 14:16:58 2014 +0100
ntdb: Fix control reaches end of non-void function.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Guenther Deschner <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/ntdb/test/run-01-new_database.c | 6 ++++++
lib/ntdb/test/run-02-expand.c | 6 ++++++
lib/ntdb/test/run-05-readonly-open.c | 6 ++++++
lib/ntdb/test/run-10-simple-store.c | 6 ++++++
lib/ntdb/test/run-11-simple-fetch.c | 6 ++++++
lib/ntdb/test/run-12-check.c | 6 ++++++
lib/ntdb/test/run-35-convert.c | 6 ++++++
lib/ntdb/test/run-capabilities.c | 6 ++++++
source3/libads/ldap.c | 7 -------
9 files changed, 48 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ntdb/test/run-01-new_database.c
b/lib/ntdb/test/run-01-new_database.c
index fe142bd..ab69477 100644
--- a/lib/ntdb/test/run-01-new_database.c
+++ b/lib/ntdb/test/run-01-new_database.c
@@ -31,4 +31,10 @@ int main(int argc, char *argv[])
break;
}
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-02-expand.c b/lib/ntdb/test/run-02-expand.c
index 635bf89..e808989 100644
--- a/lib/ntdb/test/run-02-expand.c
+++ b/lib/ntdb/test/run-02-expand.c
@@ -59,4 +59,10 @@ int main(int argc, char *argv[])
ok1(tap_log_messages == 0);
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-05-readonly-open.c
b/lib/ntdb/test/run-05-readonly-open.c
index e0de0d9..87caf95 100644
--- a/lib/ntdb/test/run-05-readonly-open.c
+++ b/lib/ntdb/test/run-05-readonly-open.c
@@ -70,4 +70,10 @@ fail:
failtest_suppress = true;
ntdb_close(ntdb);
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-10-simple-store.c
b/lib/ntdb/test/run-10-simple-store.c
index 3e5959a..0add1f1 100644
--- a/lib/ntdb/test/run-10-simple-store.c
+++ b/lib/ntdb/test/run-10-simple-store.c
@@ -56,4 +56,10 @@ fail:
failtest_suppress = true;
ntdb_close(ntdb);
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-11-simple-fetch.c
b/lib/ntdb/test/run-11-simple-fetch.c
index 9565ade..779a5ea 100644
--- a/lib/ntdb/test/run-11-simple-fetch.c
+++ b/lib/ntdb/test/run-11-simple-fetch.c
@@ -56,4 +56,10 @@ fail:
failtest_suppress = true;
ntdb_close(ntdb);
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-12-check.c b/lib/ntdb/test/run-12-check.c
index 8abc86d..7211761 100644
--- a/lib/ntdb/test/run-12-check.c
+++ b/lib/ntdb/test/run-12-check.c
@@ -43,4 +43,10 @@ fail:
failtest_suppress = true;
ntdb_close(ntdb);
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-35-convert.c b/lib/ntdb/test/run-35-convert.c
index b3ee737..873d4e7 100644
--- a/lib/ntdb/test/run-35-convert.c
+++ b/lib/ntdb/test/run-35-convert.c
@@ -55,4 +55,10 @@ int main(int argc, char *argv[])
ntdb_close(ntdb);
}
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/lib/ntdb/test/run-capabilities.c b/lib/ntdb/test/run-capabilities.c
index dac9302..f968393 100644
--- a/lib/ntdb/test/run-capabilities.c
+++ b/lib/ntdb/test/run-capabilities.c
@@ -274,4 +274,10 @@ int main(int argc, char *argv[])
out:
failtest_exit(exit_status());
+
+ /*
+ * We will never reach this but the compiler complains if we do not
+ * return in this function.
+ */
+ return EFAULT;
}
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 5258c8f..c774b44 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1971,7 +1971,6 @@ ADS_STATUS ads_get_service_principal_names(TALLOC_CTX
*mem_ctx,
{
ADS_STATUS status;
LDAPMessage *res = NULL;
- char *dn;
int count;
status = ads_find_machine_acct(ads,
@@ -1989,12 +1988,6 @@ ADS_STATUS ads_get_service_principal_names(TALLOC_CTX
*mem_ctx,
goto done;
}
- dn = ads_get_dn(ads, mem_ctx, res);
- if (dn == NULL) {
- status = ADS_ERROR_LDAP(LDAP_NO_MEMORY);
- goto done;
- }
-
*spn_array = ads_pull_strings(ads,
mem_ctx,
res,
--
Samba Shared Repository
