svn commit: samba r6025 - in branches/SAMBA_4_0/source/libcli/auth: .

abartlet at samba.org abartlet at samba.org
Thu Mar 24 03:35:51 GMT 2005


Author: abartlet
Date: 2005-03-24 03:35:51 +0000 (Thu, 24 Mar 2005)
New Revision: 6025

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6025

Log:
Remove unused variables.  This code will be modified again for the new
cli_credentials code shortly.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/libcli/auth/kerberos.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/kerberos.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/kerberos.c	2005-03-24 03:32:25 UTC (rev 6024)
+++ branches/SAMBA_4_0/source/libcli/auth/kerberos.c	2005-03-24 03:35:51 UTC (rev 6025)
@@ -5,6 +5,7 @@
    Copyright (C) Remus Koos 2001
    Copyright (C) Nalin Dahyabhai 2004.
    Copyright (C) Jeremy Allison 2004.
+   Copyright (C) Andrew Bartlett <abartlet at samba.org> 2004-2005
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -442,17 +443,13 @@
 	krb5_keyblock key;
 	krb5_data passdata;
 	char *salting_s = NULL;
-	char *machine_account = NULL, *password = NULL;
+	char *password = NULL;
 	krb5_auth_context auth_context = NULL;
 	krb5_error_code err;
 
 	memset(&passdata, '\0', sizeof(passdata));
 	memset(&key, '\0', sizeof(key));
 
-	asprintf(&machine_account, "%s$@%s", lp_netbios_name(), lp_realm());
-	if (machine_account == NULL) {
-		goto out;
-	}
 	password = secrets_fetch_machine_password(lp_workgroup());
 	if (password == NULL) {
 		goto out;
@@ -506,7 +503,6 @@
 	}
 	SAFE_FREE(salting_s);
 	SAFE_FREE(password);
-	SAFE_FREE(machine_account);
 	return ret;
 }
 



More information about the samba-cvs mailing list