[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  a431f80 s3-secrets: Remove unused secrets_delete_generic()
       via  2d02b5e s3-secrets: Remove unused secrets_delete_machine_password()
       via  a5c1e6e s3-build: allow gcov testing by linking timelimit with --coverage
      from  21528da Fix a bunch of "unused variable" warnings.

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


- Log -----------------------------------------------------------------
commit a431f80457892f3c8be8316b68480bb08b5843b4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Feb 9 15:14:34 2012 +1100

    s3-secrets: Remove unused secrets_delete_generic()
    
    Found by callcatcher.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Sat Feb 18 09:01:15 CET 2012 on sn-devel-104

commit 2d02b5e9392c13e9dbabd167809a55487e776f47
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Feb 9 15:15:56 2012 +1100

    s3-secrets: Remove unused secrets_delete_machine_password()
    
    Found by callcatcher.
    
    Andrew Bartlett

commit a5c1e6e647e556a971370ffde1fd5c5073f1bf60
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Feb 18 17:10:39 2012 +1100

    s3-build: allow gcov testing by linking timelimit with --coverage

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

Summary of changes:
 source3/Makefile.in                      |    2 +-
 source3/include/secrets.h                |    2 --
 source3/passdb/machine_account_secrets.c |   13 -------------
 source3/passdb/secrets.c                 |   16 ----------------
 4 files changed, 1 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b4b2a98..0a189b5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3178,7 +3178,7 @@ bin/tdbtorture: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) $(LIBTALLOC) $(LIBTDB)
 
 bin/timelimit: script/tests/timelimit.o
 	@echo Linking $@
-	@$(CC) -o $@ $(DYNEXP) script/tests/timelimit.o
+	@$(CC) -o $@ $(DYNEXP) script/tests/timelimit.o $(LDFLAGS)
 
 bin/rpc_open_tcp: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
 	@echo "Linking $@"
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 6cb2e04..5b778d1 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -110,7 +110,6 @@ bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
                                            struct dom_sid  *sid, time_t *pass_last_set_time);
 bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
                                            const struct dom_sid  *sid);
-bool secrets_delete_machine_password(const char *domain);
 bool secrets_delete_machine_password_ex(const char *domain);
 bool secrets_delete_domain_sid(const char *domain);
 bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel);
@@ -126,7 +125,6 @@ bool secrets_fetch_afs_key(const char *cell, struct afs_key *result);
 void secrets_fetch_ipc_userpass(char **username, char **domain, char **password);
 bool secrets_store_generic(const char *owner, const char *key, const char *secret);
 char *secrets_fetch_generic(const char *owner, const char *key);
-bool secrets_delete_generic(const char *owner, const char *key);
 
 /* The following definitions come from passdb/secrets_lsa.c  */
 NTSTATUS lsa_secret_get(TALLOC_CTX *mem_ctx,
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index 4a6642e..8aaea10 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -397,19 +397,6 @@ static bool secrets_delete_prev_machine_password(const char *domain)
 }
 
 /************************************************************************
- Routine to delete the plaintext machine account password and old
- password if any
-************************************************************************/
-
-bool secrets_delete_machine_password(const char *domain)
-{
-	if (!secrets_delete_prev_machine_password(domain)) {
-		return false;
-	}
-	return secrets_delete(machine_password_keystr(domain));
-}
-
-/************************************************************************
  Routine to delete the plaintext machine account password, old password,
  sec channel type and last change time from secrets database
 ************************************************************************/
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index bd6be35..94e514d 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -499,22 +499,6 @@ bool secrets_store_generic(const char *owner, const char *key, const char *secre
 	return ret;
 }
 
-bool secrets_delete_generic(const char *owner, const char *key)
-{
-	char *tdbkey = NULL;
-	bool ret;
-
-	if (asprintf(&tdbkey, "SECRETS/GENERIC/%s/%s", owner, key) < 0) {
-		DEBUG(0, ("asprintf failed!\n"));
-		return False;
-	}
-
-	ret = secrets_delete(tdbkey);
-
-	SAFE_FREE(tdbkey);
-	return ret;
-}
-
 /*******************************************************************
  Find the ldap password.
 ******************************************************************/


-- 
Samba Shared Repository