summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-05-29 00:20:21 +0000
committerLuke Leighton <lkcl@samba.org>2000-05-29 00:20:21 +0000
commita6e52f2b2e0de393507ac09a9dcfa211a898529c (patch)
treef3f655539dd9cfb6974606710bd73779ced7057f
parent1f69f80dd6bacb939779689c2bf9763668de2493 (diff)
downloadsamba-a6e52f2b2e0de393507ac09a9dcfa211a898529c.tar.gz
samba-a6e52f2b2e0de393507ac09a9dcfa211a898529c.tar.bz2
samba-a6e52f2b2e0de393507ac09a9dcfa211a898529c.zip
make proto
(This used to be commit 62271c30f415cad71aea9edfd578f0b7ab42fb42)
-rw-r--r--source3/include/proto.h14
-rw-r--r--source3/param/loadparm.c71
2 files changed, 45 insertions, 40 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c55a51ef70..7a95dd838e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1249,6 +1249,8 @@ char *lp_smb_passwd_file(void);
char *lp_serverstring(void);
char *lp_printcapname(void);
char *lp_lockdir(void);
+char *lp_utmpdir(void);
+char *lp_rootdir(void);
char *lp_source_environment(void);
char *lp_defaultservice(void);
char *lp_msg_command(void);
@@ -1261,6 +1263,8 @@ char *lp_passwordserver(void);
char *lp_name_resolve_order(void);
char *lp_workgroup(void);
char *lp_username_map(void);
+char *lp_groupname_map(void);
+char *lp_logon_script(void);
char *lp_logon_path(void);
char *lp_logon_drive(void);
char *lp_logon_home(void);
@@ -1270,6 +1274,7 @@ char *lp_wins_server(void);
char *lp_interfaces(void);
char *lp_socket_address(void);
char *lp_nis_home_map_name(void);
+char *lp_netbios_aliases(void);
char *lp_driverfile(void);
char *lp_panic_action(void);
char *lp_adduser_script(void);
@@ -1330,6 +1335,7 @@ BOOL lp_debug_uid(void);
BOOL lp_browse_list(void);
BOOL lp_unix_realname(void);
BOOL lp_nis_home_map(void);
+BOOL lp_bind_interfaces_only(void);
BOOL lp_unix_password_sync(void);
BOOL lp_passwd_chat_debug(void);
BOOL lp_nt_smb_support(void);
@@ -1358,10 +1364,13 @@ int lp_maxdisksize(void);
int lp_lpqcachetime(void);
int lp_syslog(void);
int lp_client_code_page(void);
+int lp_lm_announce(void);
int lp_lm_interval(void);
int lp_machine_password_timeout(void);
int lp_change_notify_timeout(void);
+int lp_stat_cache_size(void);
int lp_map_to_guest(void);
+int lp_min_passwd_length(void);
int lp_oplock_break_wait_time(void);
int lp_ldap_port(void);
char *lp_postexec(int );
@@ -1394,6 +1403,9 @@ char *lp_force_group(int );
char *lp_readlist(int );
char *lp_writelist(int );
char *lp_fstype(int );
+char *lp_vfsobj(int );
+char *lp_mangled_map(int );
+char *lp_veto_files(int );
char *lp_hide_files(int );
char *lp_veto_oplocks(int );
char *lp_driverlocation(int );
@@ -2071,7 +2083,7 @@ BOOL smb_io_hdrbuf_post(char *desc, BUFHDR *hdr, prs_struct *ps, int depth,
BOOL smb_io_hdrbuf(char *desc, BUFHDR *hdr, prs_struct *ps, int depth);
void init_uni_hdr2(UNIHDR2 *hdr, int len);
BOOL smb_io_unihdr2(char *desc, UNIHDR2 *hdr2, prs_struct *ps, int depth);
-void init_unistr(UNISTR *str, char *buf);
+void init_unistr(UNISTR *str, const char *buf);
BOOL smb_io_unistr(char *desc, UNISTR *uni, prs_struct *ps, int depth);
void init_buffer3_uint32(BUFFER3 *str, uint32 val);
void init_buffer3_str(BUFFER3 *str, char *buf, int len);
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 57f93095a2..ada49515bf 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1557,9 +1557,9 @@ FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname)
FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir)
#ifdef WITH_UTMP
- FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
+FN_GLOBAL_STRING(lp_utmpdir, &Globals.szUtmpDir)
#endif /* WITH_UTMP */
- FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
+FN_GLOBAL_STRING(lp_rootdir, &Globals.szRootdir)
FN_GLOBAL_STRING(lp_source_environment, &Globals.szSourceEnv)
FN_GLOBAL_STRING(lp_defaultservice, &Globals.szDefaultService)
FN_GLOBAL_STRING(lp_msg_command, &Globals.szMsgCommand)
@@ -1573,9 +1573,9 @@ FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
FN_GLOBAL_STRING(lp_workgroup, &Globals.szWorkGroup)
FN_GLOBAL_STRING(lp_username_map, &Globals.szUsernameMap)
#ifdef USING_GROUPNAME_MAP
- FN_GLOBAL_STRING(lp_groupname_map, &Globals.szGroupnameMap)
+FN_GLOBAL_STRING(lp_groupname_map, &Globals.szGroupnameMap)
#endif /* USING_GROUPNAME_MAP */
- FN_GLOBAL_STRING(lp_logon_script, &Globals.szLogonScript)
+FN_GLOBAL_STRING(lp_logon_script, &Globals.szLogonScript)
FN_GLOBAL_STRING(lp_logon_path, &Globals.szLogonPath)
FN_GLOBAL_STRING(lp_logon_drive, &Globals.szLogonDrive)
FN_GLOBAL_STRING(lp_logon_home, &Globals.szLogonHome)
@@ -1585,8 +1585,8 @@ FN_GLOBAL_STRING(lp_wins_server, &Globals.szWINSserver)
FN_GLOBAL_STRING(lp_interfaces, &Globals.szInterfaces)
FN_GLOBAL_STRING(lp_socket_address, &Globals.szSocketAddress)
FN_GLOBAL_STRING(lp_nis_home_map_name, &Globals.szNISHomeMapName)
- static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
- FN_GLOBAL_STRING(lp_netbios_aliases, &Globals.szNetbiosAliases)
+static FN_GLOBAL_STRING(lp_announce_version, &Globals.szAnnounceVersion)
+FN_GLOBAL_STRING(lp_netbios_aliases, &Globals.szNetbiosAliases)
FN_GLOBAL_STRING(lp_driverfile, &Globals.szDriverFile)
FN_GLOBAL_STRING(lp_panic_action, &Globals.szPanicAction)
FN_GLOBAL_STRING(lp_adduser_script, &Globals.szAddUserScript)
@@ -1653,8 +1653,8 @@ FN_GLOBAL_BOOL(lp_debug_uid, &Globals.bDebugUid)
FN_GLOBAL_BOOL(lp_browse_list, &Globals.bBrowseList)
FN_GLOBAL_BOOL(lp_unix_realname, &Globals.bUnixRealname)
FN_GLOBAL_BOOL(lp_nis_home_map, &Globals.bNISHomeMap)
- static FN_GLOBAL_BOOL(lp_time_server, &Globals.bTimeServer)
- FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly)
+static FN_GLOBAL_BOOL(lp_time_server, &Globals.bTimeServer)
+FN_GLOBAL_BOOL(lp_bind_interfaces_only, &Globals.bBindInterfacesOnly)
FN_GLOBAL_BOOL(lp_unix_password_sync, &Globals.bUnixPasswdSync)
FN_GLOBAL_BOOL(lp_passwd_chat_debug, &Globals.bPasswdChatDebug)
FN_GLOBAL_BOOL(lp_nt_smb_support, &Globals.bNTSmbSupport)
@@ -1683,22 +1683,14 @@ FN_GLOBAL_INTEGER(lp_maxdisksize, &Globals.maxdisksize)
FN_GLOBAL_INTEGER(lp_lpqcachetime, &Globals.lpqcachetime)
FN_GLOBAL_INTEGER(lp_syslog, &Globals.syslog)
FN_GLOBAL_INTEGER(lp_client_code_page, &Globals.client_code_page)
- static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
- FN_GLOBAL_INTEGER(lp_lm_announce, &Globals.lm_announce)
+static FN_GLOBAL_INTEGER(lp_announce_as, &Globals.announce_as)
+FN_GLOBAL_INTEGER(lp_lm_announce, &Globals.lm_announce)
FN_GLOBAL_INTEGER(lp_lm_interval, &Globals.lm_interval)
-FN_GLOBAL_INTEGER(lp_machine_password_timeout,
- &Globals.
- machine_password_timeout)
-FN_GLOBAL_INTEGER(lp_change_notify_timeout,
- &Globals.
- change_notify_timeout) FN_GLOBAL_INTEGER(lp_stat_cache_size,
- &Globals.
- stat_cache_size)
-FN_GLOBAL_INTEGER(lp_map_to_guest,
- &Globals.
- map_to_guest) FN_GLOBAL_INTEGER(lp_min_passwd_length,
- &Globals.
- min_passwd_length)
+FN_GLOBAL_INTEGER(lp_machine_password_timeout, &Globals.machine_password_timeout)
+FN_GLOBAL_INTEGER(lp_change_notify_timeout, &Globals.change_notify_timeout)
+FN_GLOBAL_INTEGER(lp_stat_cache_size, &Globals.stat_cache_size)
+FN_GLOBAL_INTEGER(lp_map_to_guest, &Globals.map_to_guest)
+FN_GLOBAL_INTEGER(lp_min_passwd_length, &Globals.min_passwd_length)
FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time)
#ifdef WITH_LDAP
FN_GLOBAL_INTEGER(lp_ldap_port, &Globals.ldap_port)
@@ -1733,10 +1725,11 @@ FN_LOCAL_STRING(lp_force_user, force_user)
FN_LOCAL_STRING(lp_force_group, force_group)
FN_LOCAL_STRING(lp_readlist, readlist)
FN_LOCAL_STRING(lp_writelist, writelist)
-FN_LOCAL_STRING(lp_fstype, fstype) FN_LOCAL_STRING(lp_vfsobj, szVfsObjectFile)
- static FN_LOCAL_STRING(lp_volume, volume)
- FN_LOCAL_STRING(lp_mangled_map, szMangledMap)
- FN_LOCAL_STRING(lp_veto_files, szVetoFiles)
+FN_LOCAL_STRING(lp_fstype, fstype)
+FN_LOCAL_STRING(lp_vfsobj, szVfsObjectFile)
+static FN_LOCAL_STRING(lp_volume, volume)
+FN_LOCAL_STRING(lp_mangled_map, szMangledMap)
+FN_LOCAL_STRING(lp_veto_files, szVetoFiles)
FN_LOCAL_STRING(lp_hide_files, szHideFiles)
FN_LOCAL_STRING(lp_veto_oplocks, szVetoOplockFiles)
FN_LOCAL_STRING(lp_driverlocation, szPrinterDriverLocation)
@@ -1800,23 +1793,23 @@ FN_LOCAL_INTEGER(lp_write_cache_size, iWriteCacheSize)
FN_LOCAL_CHAR(lp_magicchar, magic_char)
FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
/* local prototypes */
- static int strwicmp(char *psz1, char *psz2);
- static int map_parameter(char *pszParmName);
- static BOOL set_boolean(BOOL *pb, char *pszParmValue);
- static int getservicebyname(char *pszServiceName,
- service * pserviceDest);
- static void copy_service(service * pserviceDest,
- service * pserviceSource, BOOL *pcopymapDest);
- static BOOL service_ok(int iService);
- static BOOL do_parameter(char *pszParmName, char *pszParmValue);
- static BOOL do_section(char *pszSectionName);
- static void init_copymap(service * pservice);
+static int strwicmp(char *psz1, char *psz2);
+static int map_parameter(char *pszParmName);
+static BOOL set_boolean(BOOL *pb, char *pszParmValue);
+static int getservicebyname(char *pszServiceName,
+ service * pserviceDest);
+static void copy_service(service * pserviceDest,
+ service * pserviceSource, BOOL *pcopymapDest);
+static BOOL service_ok(int iService);
+static BOOL do_parameter(char *pszParmName, char *pszParmValue);
+static BOOL do_section(char *pszSectionName);
+static void init_copymap(service * pservice);
/***************************************************************************
initialise a service to the defaults
***************************************************************************/
- static void init_service(service * pservice)
+static void init_service(service * pservice)
{
memset((char *)pservice, '\0', sizeof(service));
copy_service(pservice, &sDefault, NULL);