svn commit: samba r15123 - branches/SAMBA_3_0/source/utils trunk/source/utils

[Andrew Bartlett]

On Tue, 2006-04-18 at 13:22 +0000, gd at samba.org wrote:
> Author: gd
> Date: 2006-04-18 13:22:14 +0000 (Tue, 18 Apr 2006)
> New Revision: 15123
> 
> WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15123
> 
> Log:
> Don't even try to join with an inproper configuration.
> 
> Guenther
> 
> Modified:
>    branches/SAMBA_3_0/source/utils/net_ads.c
>    branches/SAMBA_3_0/source/utils/net_rpc.c
>    trunk/source/utils/net_ads.c
>    trunk/source/utils/net_rpc.c
> 
> 
> Changeset:
> Modified: branches/SAMBA_3_0/source/utils/net_ads.c
> ===================================================================
> --- branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-18 13:06:49 UTC (rev 15122)
> +++ branches/SAMBA_3_0/source/utils/net_ads.c	2006-04-18 13:22:14 UTC (rev 15123)
> @@ -721,6 +721,13 @@
>  	const char *short_domain_name = NULL;
>  	TALLOC_CTX *ctx = NULL;
>  
> +	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) || 
> +	    (lp_server_role() != ROLE_DOMAIN_BDC)) {
> +		d_printf("can only join as domain member or as BDC\n");
> +		return -1;
> +	}
> +
> +
>  	if (argc > 0) {
>  		org_unit = argv[0];
>  	}
> 
> Modified: branches/SAMBA_3_0/source/utils/net_rpc.c
> ===================================================================
> --- branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-18 13:06:49 UTC (rev 15122)
> +++ branches/SAMBA_3_0/source/utils/net_rpc.c	2006-04-18 13:22:14 UTC (rev 15123)
> @@ -389,6 +389,12 @@
>  
>  int net_rpc_join(int argc, const char **argv) 
>  {
> +	if ((lp_server_role() != ROLE_DOMAIN_MEMBER) || 
> +	    (lp_server_role() != ROLE_DOMAIN_BDC)) {
> +		d_printf("can only join as domain member or as BDC\n");
> +		return -1;
> +	}
> +
>  	if ((net_rpc_perform_oldjoin(argc, argv) == 0))
>  		return 0;
>  	

What is improper about joining a domain as a PDC?  We need this for when
Samba does a 'self join' to support winbindd (and for example Squid) on
the DC.

Perhaps what you are looking for is a test to say we can't join as a
standalone server.

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
Student Network Administrator, Hawker College  http://hawkerc.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : http://lists.samba.org/archive/samba-technical/attachments/20060423/eca5fa88/attachment.bin