[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  475d296... s3-net: use generated krb5.conf in 'net ads testjoin'
      from  3b40ec8... s3-docs: mention -M option and remove nonexisting -G 
option in pdbedit manpage.

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


- Log -----------------------------------------------------------------
commit 475d296065d57f9b38b109203b40ed0b47a2ac7e
Author: Günther Deschner <g...@samba.org>
Date:   Wed Dec 16 21:22:50 2009 +0100

    s3-net: use generated krb5.conf in 'net ads testjoin'
    
    Guenther

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

Summary of changes:
 source3/utils/net_ads.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index f133eec..8e644bb 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1007,6 +1007,8 @@ static NTSTATUS net_ads_join_ok(struct net_context *c)
 {
        ADS_STRUCT *ads = NULL;
        ADS_STATUS status;
+       fstring dc_name;
+       struct sockaddr_storage dcip;
 
        if (!secrets_init()) {
                DEBUG(1,("Failed to initialise secrets database\n"));
@@ -1015,6 +1017,8 @@ static NTSTATUS net_ads_join_ok(struct net_context *c)
 
        net_use_krb_machine_account(c);
 
+       get_dc_name(lp_workgroup(), lp_realm(), dc_name, &dcip);
+
        status = ads_startup(c, true, &ads);
        if (!ADS_ERR_OK(status)) {
                return ads_ntstatus(status);


-- 
Samba Shared Repository