svn commit: samba r7404 - in trunk/source: . param sam
jerry at samba.org
jerry at samba.org
Wed Jun 8 19:18:12 GMT 2005
Author: jerry
Date: 2005-06-08 19:18:10 +0000 (Wed, 08 Jun 2005)
New Revision: 7404
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7404
Log:
removing a few vestiges of the printer db code since it has been moved to branches/tmp/PRINTERDB
Modified:
trunk/source/configure.in
trunk/source/param/loadparm.c
trunk/source/sam/idmap_rid.c
Changeset:
Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in 2005-06-08 18:14:55 UTC (rev 7403)
+++ trunk/source/configure.in 2005-06-08 19:18:10 UTC (rev 7404)
@@ -420,7 +420,7 @@
dnl Add modules that have to be built by default here
dnl These have to be built static:
-default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_lsa_ds rpc_wks rpc_svcctl rpc_net rpc_dfs rpc_srv rpc_spoolss rpc_eventlog rpc_unixinfo auth_rhosts auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin printerdb_file"
+default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_lsa_ds rpc_wks rpc_svcctl rpc_net rpc_dfs rpc_srv rpc_spoolss rpc_eventlog rpc_unixinfo auth_rhosts auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin"
dnl These are preferably build shared, and static if dlopen() is not available
default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437"
@@ -2627,7 +2627,7 @@
if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes" -a x"$ac_cv_func_ext_ldap_domain2hostlist" = x"yes"; then
AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
- default_static_modules="$default_static_modules pdb_ldap idmap_ldap printerdb_ldap";
+ default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
default_shared_modules="$default_shared_modules config_ldap";
SMBLDAP="lib/smbldap.o"
SMBLDAPUTIL="lib/smbldap_util.o"
@@ -4516,7 +4516,6 @@
MODULE_rpc_spoolss=STATIC
MODULE_rpc_srv=STATIC
MODULE_idmap_tdb=STATIC
-MODULE_printerdb_tdb=STATIC
AC_ARG_WITH(static-modules,
[ --with-static-modules=MODULES Comma-seperated list of names of modules to statically link in],
@@ -4577,11 +4576,6 @@
SMB_MODULE(idmap_rid, sam/idmap_rid.o, "bin/idmap_rid.$SHLIBEXT", IDMAP)
SMB_SUBSYSTEM(IDMAP,sam/idmap.o)
-SMB_MODULE(printerdb_tdb, printing/printerdb_tdb.o, "bin/printerdb_tdb.$SHLIBEXT", PRINTERDB)
-SMB_MODULE(printerdb_ldap, printing/printerdb_ldap.o, "bin/printerdb_ldap.$SHLIBEXT", PRINTERDB)
-SMB_MODULE(printerdb_file, printing/printerdb_file.o, "bin/printerdb_file.$SHLIBEXT", PRINTERDB)
-SMB_SUBSYSTEM(PRINTERDB,printing/printerdb.o)
-
SMB_MODULE(charset_weird, modules/weird.o, "bin/weird.$SHLIBEXT", CHARSET)
SMB_MODULE(charset_CP850, modules/CP850.o, "bin/CP850.$SHLIBEXT", CHARSET)
SMB_MODULE(charset_CP437, modules/CP437.o, "bin/CP437.$SHLIBEXT", CHARSET)
Modified: trunk/source/param/loadparm.c
===================================================================
--- trunk/source/param/loadparm.c 2005-06-08 18:14:55 UTC (rev 7403)
+++ trunk/source/param/loadparm.c 2005-06-08 19:18:10 UTC (rev 7404)
@@ -265,7 +265,6 @@
BOOL bObeyPamRestrictions;
BOOL bLoadPrinters;
int PrintcapCacheTime;
- int printerdb_cache_time;
BOOL bLargeReadwrite;
BOOL bReadRaw;
BOOL bWriteRaw;
@@ -997,7 +996,6 @@
{"max reported print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxReportedPrintJobs, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
{"max print jobs", P_INTEGER, P_LOCAL, &sDefault.iMaxPrintJobs, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
{"load printers", P_BOOL, P_GLOBAL, &Globals.bLoadPrinters, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
- {"printerdb cache time", P_INTEGER, P_GLOBAL, &Globals.printerdb_cache_time, NULL, NULL, FLAG_ADVANCED},
{"printcap cache time", P_INTEGER, P_GLOBAL, &Globals.PrintcapCacheTime, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
{"printcap name", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
{"printcap", P_STRING, P_GLOBAL, &Globals.szPrintcapname, NULL, NULL, FLAG_HIDE},
@@ -1131,7 +1129,6 @@
{"ldap group suffix", P_STRING, P_GLOBAL, &Globals.szLdapGroupSuffix, NULL, NULL, FLAG_ADVANCED},
{"ldap idmap suffix", P_STRING, P_GLOBAL, &Globals.szLdapIdmapSuffix, NULL, NULL, FLAG_ADVANCED},
{"ldap machine suffix", P_STRING, P_GLOBAL, &Globals.szLdapMachineSuffix, NULL, NULL, FLAG_ADVANCED},
- {"ldap printer suffix", P_STRING, P_GLOBAL, &Globals.szLdapPrinterSuffix, NULL, NULL, FLAG_ADVANCED},
{"ldap passwd sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_ADVANCED},
{"ldap password sync", P_ENUM, P_GLOBAL, &Globals.ldap_passwd_sync, NULL, enum_ldap_passwd_sync, FLAG_HIDE},
{"ldap replication sleep", P_INTEGER, P_GLOBAL, &Globals.ldap_replication_sleep, NULL, NULL, FLAG_ADVANCED},
@@ -1224,7 +1221,6 @@
{"enable rid algorithm", P_BOOL, P_GLOBAL, &Globals.bEnableRidAlgorithm, NULL, NULL, FLAG_DEPRECATED},
{"idmap backend", P_LIST, P_GLOBAL, &Globals.szIdmapBackend, NULL, NULL, FLAG_ADVANCED},
- {"printerdb backend", P_LIST, P_GLOBAL, &Globals.szPrinterDBBackend, NULL, NULL, FLAG_ADVANCED},
{"idmap uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_ADVANCED},
{"winbind uid", P_STRING, P_GLOBAL, &Globals.szIdmapUID, handle_idmap_uid, NULL, FLAG_HIDE},
{"idmap gid", P_STRING, P_GLOBAL, &Globals.szIdmapGID, handle_idmap_gid, NULL, FLAG_ADVANCED},
@@ -1425,7 +1421,6 @@
Globals.bLoadPrinters = True;
Globals.PrintcapCacheTime = 750; /* 12.5 minutes */
- Globals.printerdb_cache_time = 300; /* 5 minutes */
/* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */
/* Discovered by 2 days of pain by Don McCall @ HP :-). */
@@ -1704,7 +1699,6 @@
FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir)
FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString)
FN_GLOBAL_INTEGER(lp_printcap_cache_time, &Globals.PrintcapCacheTime)
-FN_GLOBAL_INTEGER(lp_printerdb_cache_time, &Globals.printerdb_cache_time)
FN_GLOBAL_STRING(lp_enumports_cmd, &Globals.szEnumPortsCommand)
FN_GLOBAL_STRING(lp_addprinter_cmd, &Globals.szAddPrinterCommand)
FN_GLOBAL_STRING(lp_deleteprinter_cmd, &Globals.szDeletePrinterCommand)
@@ -1779,7 +1773,6 @@
FN_GLOBAL_LIST(lp_idmap_backend, &Globals.szIdmapBackend)
-FN_GLOBAL_LIST(lp_printerdb_backend, &Globals.szPrinterDBBackend)
FN_GLOBAL_BOOL(lp_enable_rid_algorithm, &Globals.bEnableRidAlgorithm)
#ifdef WITH_LDAP_SAMCONFIG
@@ -3082,15 +3075,6 @@
return lp_string(Globals.szLdapSuffix);
}
-char *lp_ldap_printer_suffix(void)
-{
- if (Globals.szLdapPrinterSuffix[0])
- return append_ldap_suffix(Globals.szLdapPrinterSuffix);
-
- return lp_string(Globals.szLdapSuffix);
-}
-
-
/***************************************************************************
***************************************************************************/
Modified: trunk/source/sam/idmap_rid.c
===================================================================
--- trunk/source/sam/idmap_rid.c 2005-06-08 18:14:55 UTC (rev 7403)
+++ trunk/source/sam/idmap_rid.c 2005-06-08 19:18:10 UTC (rev 7404)
@@ -549,5 +549,6 @@
NTSTATUS init_module(void)
{
return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "idmap_rid", &rid_methods);
+ return smb_register_idmap(SMB_IDMAP_INTERFACE_VERSION, "rid", &rid_methods);
}
More information about the samba-cvs
mailing list