Am Montag, 2. September 2002 20:56 schrieb Alexander Bokovoy: > > > I've updated the recycle bin to use the parametrical options inside > > smb.conf. I think you told me at the SambaXP conference how to find out, > > if the service is derived from [homes]. Could you tell me again ? > > I promized tridge to fix this but haven't done it yet. Expect this in a > middle of September. :( > > > I need to find this out or the parametrical options won't work for > > [homes]. > > Metze did something to fix this by specifying user names as shares. This > is a hack and I must complete parametrical options instead. >
For now I'm using my old patch for loadparam.c and these lines in vfs_recycle.c: if (lp_home_service(SNUM(conn)) == True ) servicename = lp_homes_name(); else servicename = lp_servicename(SNUM(conn)); Btw. what was the reason for removing libtool ? Building VFS modules for AIX and Solaris is broken now and Linux VFS modules are 10 times the size they were before. ...Juergen
--- param/loadparm.orig Thu Aug 29 20:14:45 2002 +++ param/loadparm.c Tue Sep 3 20:43:18 2002 @@ -384,8 +384,9 @@ BOOL bUseClientDriver; BOOL bDefaultDevmode; BOOL bNTAclSupport; + BOOL bHomeService; - char dummy[3]; /* for alignment */ + char dummy[2]; /* for alignment */ } service; @@ -504,6 +505,7 @@ False, /* bUseClientDriver */ False, /* bDefaultDevmode */ True, /* bNTAclSupport */ + False, /* bHomeService */ "" /* dummy */ }; @@ -1743,6 +1745,8 @@ FN_GLOBAL_BOOL(lp_algorithmic_rid_base, &Globals.bAlgorithmicRidBase) FN_GLOBAL_INTEGER(lp_name_cache_timeout, &Globals.name_cache_timeout) +FN_LOCAL_BOOL(lp_home_service, bHomeService) + typedef struct _param_opt_struct param_opt_struct; struct _param_opt_struct { char *key; @@ -1950,6 +1954,7 @@ } ServicePtrs[i]->bAvailable = sDefault.bAvailable; ServicePtrs[i]->bBrowseable = sDefault.bBrowseable; + ServicePtrs[i]->bHomeService = True; DEBUG(3, ("adding home's share [%s] for user '%s' at '%s'\n", pszHomename, @@ -3398,6 +3403,15 @@ } /*************************************************************************** + Return name of HOMES service +***************************************************************************/ + +const char* lp_homes_name(void) +{ + return (HOMES_NAME); +} + +/*************************************************************************** Have we loaded a services file yet? ***************************************************************************/