sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

r24573: Fix build without LDAP. Thanks Volker for pointing this out.

Browse Source 
Guenther
(This used to be commit 1bae53e39f)
This commit is contained in:
Günther Deschner 2007-08-20 09:47:13 +00:00 committed by Gerald (Jerry) Carter
parent 987d7010f8
commit 18e6f9c6aa
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/libgpo/gpo_ini.c
View File

@ -145,12 +145,8 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
talloc_set_destructor(ctx, gp_inifile_free_context);
#ifdef HAVE_LDAP
status = gp_find_file(mem_ctx, flags, unix_path, suffix,
&ini_filename);
#else
status = NT_STATUS_NOT_IMPLEMENTED;
#endif
if (!NT_STATUS_IS_OK(status)) {
goto failed;

14
source3/libgpo/gpo_ldap.c
View File

@ -1,26 +1,24 @@
/*
/*
* Unix SMB/CIFS implementation.
* Group Policy Object Support
* Copyright (C) Guenther Deschner 2005,2007
*
*
* 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#ifdef HAVE_LDAP
/****************************************************************
parse the raw extension string into a GP_EXT structure
****************************************************************/
@ -149,6 +147,8 @@ BOOL ads_parse_gp_ext(TALLOC_CTX *mem_ctx,
return ret;
}
#ifdef HAVE_LDAP
/****************************************************************
parse the raw link string into a GP_LINK structure
****************************************************************/
@ -158,7 +158,7 @@ static ADS_STATUS gpo_parse_gplink(TALLOC_CTX *mem_ctx,
uint32_t options,
struct GP_LINK *gp_link)
{
ADS_STATUS status = ADS_ERROR(LDAP_NO_MEMORY);
ADS_STATUS status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
char **link_list;
int i;

11
source3/libgpo/gpo_util.c
View File

@ -19,8 +19,6 @@
#include "includes.h"
#ifdef HAVE_LDAP
#define DEFAULT_DOMAIN_POLICY "Default Domain Policy"
#define DEFAULT_DOMAIN_CONTROLLERS_POLICY "Default Domain Controllers Policy"
@ -216,6 +214,8 @@ void dump_gp_ext(struct GP_EXT *gp_ext, int debuglevel)
}
}
#ifdef HAVE_LDAP
/****************************************************************
****************************************************************/
@ -395,6 +395,8 @@ void dump_gplink(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct GP_LINK *gp_link)
}
}
#endif /* HAVE_LDAP */
/****************************************************************
****************************************************************/
@ -441,7 +443,7 @@ ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads,
if (!ads_parse_gp_ext(mem_ctx, gpo->machine_extensions,
&gp_ext)) {
return ADS_ERROR(LDAP_PARAM_ERROR);
return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
} else {
@ -455,7 +457,7 @@ ADS_STATUS gpo_process_a_gpo(ADS_STRUCT *ads,
if (!ads_parse_gp_ext(mem_ctx, gpo->user_extensions,
&gp_ext)) {
return ADS_ERROR(LDAP_PARAM_ERROR);
return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
} else {
/* nothing to apply */
@ -703,4 +705,3 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_SUCH_FILE;
}
#endif /* HAVE_LDAP */