diff options
| author | Michael Adam <obnox@samba.org> | 2011-06-10 00:36:17 +0200 | 
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-06-11 11:44:31 +0200 | 
| commit | c4427f06466ad1b5cdc5215704852a559d5a439d (patch) | |
| tree | d2b1b279f30020b316d0f432ee08bff0ce1fdfd4 | |
| parent | 241ed0a04247d5062926443a8a3a481697299e60 (diff) | |
| download | samba-c4427f06466ad1b5cdc5215704852a559d5a439d.tar.gz samba-c4427f06466ad1b5cdc5215704852a559d5a439d.tar.bz2 samba-c4427f06466ad1b5cdc5215704852a559d5a439d.zip  | |
Revert "s3:idmap_autorid: fail initialization if the domain is not "*""
This reverts commit cd8dc47bf17d2cdb1558dc6ab49320ba12af8f34.
This sequence of patches needs to be done differently.
| -rw-r--r-- | source3/winbindd/idmap_autorid.c | 10 | 
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c index 0e1750d7c4..b28382f2af 100644 --- a/source3/winbindd/idmap_autorid.c +++ b/source3/winbindd/idmap_autorid.c @@ -438,15 +438,7 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom)  	TALLOC_CTX *frame = talloc_stackframe();  	char *config_option = NULL; -	if (!strequal(dom->name, "*")) { -		DEBUG(0, ("idmap_autorid_initialize: Error: autorid configured " -			  "for domain '%s'. But autorid can only be used for " -			  "the default idmap configuration.\n", dom->name)); -		status = NT_STATUS_INVALID_PARAMETER; -		goto error; -	} - -	config = talloc_zero(dom, struct autorid_global_config); +	config = talloc_zero(frame, struct autorid_global_config);  	if (!config) {  		DEBUG(0, ("Out of memory!\n"));  		status = NT_STATUS_NO_MEMORY;  | 
