sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Remove include/local.h and move defines to more appropriate places.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-10-24 17:53:38 +02:00
parent a665f5f5a1
commit 0218669d62
6 changed files with 35 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util/util.h
View File

@ -353,6 +353,8 @@ _PUBLIC_ bool strequal(const char *s1, const char *s2);
/* The following definitions come from lib/util/util_strlist.c */
/* separators for lists */
#define LIST_SEP " \t,\n\r"
/**
build a null terminated list of strings from a input string and a

6
source4/client/client.c
View File

@ -53,6 +53,12 @@
#include "param/param.h"
#include "librpc/rpc/dcerpc.h"
/* the default pager to use for the client "more" command. Users can
* override this with the PAGER environment variable */
#ifndef DEFAULT_PAGER
#define DEFAULT_PAGER "more"
#endif
struct smbclient_context {
char *remote_cur_dir;
struct smbcli_state *cli;

2
source4/include/includes.h
View File

@ -30,8 +30,6 @@
#endif
#endif /* NO_CONFIG_H */
#include "local.h"
#include "system/time.h"
#include "system/wait.h"

51
source4/include/local.h
View File

@ -1,51 +0,0 @@
/* Copyright (C) 1995-1998 Samba-Team */
/* Copyright (C) 1998 John H Terpstra <jht@aquasoft.com.au> */
/* local definitions for file server */
#ifndef _LOCAL_H
#define _LOCAL_H
/* The default workgroup - usually overridden in smb.conf */
#ifndef DEFAULT_WORKGROUP
#define DEFAULT_WORKGROUP "WORKGROUP"
#endif
/* the maximum debug level to compile into the code. This assumes a good
optimising compiler that can remove unused code
for embedded or low-memory systems set this to a value like 2 to get
only important messages. This gives *much* smaller binaries
*/
#ifndef MAX_DEBUG_LEVEL
#define MAX_DEBUG_LEVEL 1000
#endif
/* This defines the section name in the configuration file that will contain */
/* global parameters - that is, parameters relating to the whole server, not */
/* just services. This name is then reserved, and may not be used as a */
/* a service name. It will default to "global" if not defined here. */
#define GLOBAL_NAME "global"
#define GLOBAL_NAME2 "globals"
/* define what facility to use for syslog */
#ifndef SYSLOG_FACILITY
#define SYSLOG_FACILITY LOG_DAEMON
#endif
/* separators for lists */
#define LIST_SEP " \t,\n\r"
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
#ifndef DEFAULT_PAGER
#define DEFAULT_PAGER "more"
#endif
/*
* Default passwd chat script.
*/
#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
/* Max number of jobs per print queue. */
#define PRINT_MAX_JOBID 10000
#endif

3
source4/param/generic.c
View File

@ -127,9 +127,6 @@ const char **param_get_string_list(struct param_context *ctx, const char *param,
if (p == NULL)
return NULL;
if (separator == NULL)
separator = LIST_SEP;
return (const char **)str_list_make(ctx, p->value, separator);
}

30
source4/param/loadparm.h
View File

@ -59,9 +59,6 @@ struct parm_struct {
} def;
};
#define FLAG_DEFAULT 0x0001 /* this option was a default */
#define FLAG_CMDLINE 0x0002 /* this option was set from the command line */
@ -73,3 +70,30 @@ struct parm_struct {
#define HOMES_NAME "homes"
#endif
/* This defines the section name in the configuration file that will contain */
/* global parameters - that is, parameters relating to the whole server, not */
/* just services. This name is then reserved, and may not be used as a */
/* a service name. It will default to "global" if not defined here. */
#ifndef GLOBAL_NAME
#define GLOBAL_NAME "global"
#define GLOBAL_NAME2 "globals"
#endif
/* The default workgroup - usually overridden in smb.conf */
#ifndef DEFAULT_WORKGROUP
#define DEFAULT_WORKGROUP "WORKGROUP"
#endif
/*
* Default passwd chat script.
*/
#ifndef DEFAULT_PASSWD_CHAT
#define DEFAULT_PASSWD_CHAT "*new*password* %n\\n *new*password* %n\\n *changed*"
#endif
/* Max number of jobs per print queue. */
#ifndef PRINT_MAX_JOBID
#define PRINT_MAX_JOBID 10000
#endif