svn commit: samba r19772 - in branches/SAMBA_3_0_24:
examples/libsmbclient examples/misc examples/pdb
packaging/Debian/debian-sarge packaging/Debian/debian-woody
jerry at samba.org
jerry at samba.org
Sat Nov 18 16:49:17 GMT 2006
Author: jerry
Date: 2006-11-18 16:49:17 +0000 (Sat, 18 Nov 2006)
New Revision: 19772
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19772
Log:
syncing some non-source files
Modified:
branches/SAMBA_3_0_24/examples/libsmbclient/Makefile
branches/SAMBA_3_0_24/examples/libsmbclient/testacl.c
branches/SAMBA_3_0_24/examples/libsmbclient/testbrowse.c
branches/SAMBA_3_0_24/examples/misc/adssearch.pl
branches/SAMBA_3_0_24/examples/pdb/test.c
branches/SAMBA_3_0_24/packaging/Debian/debian-sarge/smb.conf
branches/SAMBA_3_0_24/packaging/Debian/debian-woody/smb.conf
Changeset:
Modified: branches/SAMBA_3_0_24/examples/libsmbclient/Makefile
===================================================================
--- branches/SAMBA_3_0_24/examples/libsmbclient/Makefile 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/examples/libsmbclient/Makefile 2006-11-18 16:49:17 UTC (rev 19772)
@@ -6,10 +6,12 @@
-I/usr/include/glib-1.2 \
-I/usr/lib/glib/include
+
DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
LDFLAGS = -L/usr/local/samba/lib
+LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
TESTS= testsmbc \
tree \
@@ -26,43 +28,43 @@
testsmbc: testsmbc.o
@echo Linking testsmbc
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsmbclient
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT)
tree: tree.o
@echo Linking tree
- @$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` -lsmbclient $<
+ @$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` $(LIBSMBCLIENT) $<
testacl: testacl.o
@echo Linking testacl
- @$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` -lsmbclient -lpopt $<
+ @$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` $(LIBSMBCLIENT) -lpopt $<
testbrowse: testbrowse.o
@echo Linking testbrowse
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -lsmbclient -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
testbrowse2: testbrowse2.o
@echo Linking testbrowse2
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -lsmbclient -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
teststat: teststat.o
@echo Linking teststat
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
teststat2: teststat2.o
@echo Linking teststat2
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
testchmod: testchmod.o
@echo Linking testchmod
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
testutime: testutime.o
@echo Linking testutime
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
testread: testread.o
@echo Linking testread
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ /usr/local/samba/lib/libsmbclient.so -lpopt $<
+ @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
smbsh:
make -C smbwrapper
Modified: branches/SAMBA_3_0_24/examples/libsmbclient/testacl.c
===================================================================
--- branches/SAMBA_3_0_24/examples/libsmbclient/testacl.c 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/examples/libsmbclient/testacl.c 2006-11-18 16:49:17 UTC (rev 19772)
@@ -23,6 +23,7 @@
int flags;
int debug = 0;
int numeric = 0;
+ int full_time_names = 0;
enum acl_mode mode = SMB_ACL_GET;
static char *the_acl = NULL;
int ret;
@@ -43,6 +44,11 @@
0, "Set debug level (0-100)"
},
{
+ "full_time_names", 'f', POPT_ARG_NONE, &full_time_names,
+ 1,
+ "Use new style xattr names, which include CREATE_TIME"
+ },
+ {
"delete", 'D', POPT_ARG_STRING, NULL,
'D', "Delete an acl", "ACL"
},
@@ -133,6 +139,11 @@
printf("Could not initialize smbc_ library\n");
return 1;
}
+
+ if (full_time_names) {
+ SMBCCTX *context = smbc_set_context(NULL);
+ smbc_option_set(context, "full_time_names", 1);
+ }
/* Perform requested action */
@@ -143,11 +154,11 @@
{
if (numeric)
{
- the_acl = "system.nt_sec_desc.*";
+ the_acl = "system.*";
}
else
{
- the_acl = "system.nt_sec_desc.*+";
+ the_acl = "system.*+";
}
}
ret = smbc_getxattr(path, the_acl, value, sizeof(value));
Modified: branches/SAMBA_3_0_24/examples/libsmbclient/testbrowse.c
===================================================================
--- branches/SAMBA_3_0_24/examples/libsmbclient/testbrowse.c 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/examples/libsmbclient/testbrowse.c 2006-11-18 16:49:17 UTC (rev 19772)
@@ -120,10 +120,10 @@
(no_auth ? no_auth_data_fn : get_auth_data_fn);
}
- /* If we've been asked to log to stderr instead of stdout... */
+ /* If we've been asked to log to stderr instead of stdout, ... */
if (debug_stderr) {
/* ... then set the option to do so */
- smbc_option_set(context, "debug_stderr", (void *) 1);
+ smbc_option_set(context, "debug_to_stderr", 1);
}
/* Initialize the context using the previously specified options */
Modified: branches/SAMBA_3_0_24/examples/misc/adssearch.pl
===================================================================
--- branches/SAMBA_3_0_24/examples/misc/adssearch.pl 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/examples/misc/adssearch.pl 2006-11-18 16:49:17 UTC (rev 19772)
@@ -388,7 +388,7 @@
# get the base
-$base = $opt_base ||
+$base = defined($opt_base)? $opt_base : "" ||
get_base_from_rootdse($server,$dse);
# get the realm
Modified: branches/SAMBA_3_0_24/examples/pdb/test.c
===================================================================
--- branches/SAMBA_3_0_24/examples/pdb/test.c 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/examples/pdb/test.c 2006-11-18 16:49:17 UTC (rev 19772)
@@ -45,10 +45,10 @@
}
/*****************************************************************
- Get one SAM_ACCOUNT from the list (next in line)
+ Get one struct samu from the list (next in line)
*****************************************************************/
-static NTSTATUS testsam_getsampwent(struct pdb_methods *methods, SAM_ACCOUNT *user)
+static NTSTATUS testsam_getsampwent(struct pdb_methods *methods, struct samu *user)
{
DEBUG(10, ("testsam_getsampwent called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -58,7 +58,7 @@
Lookup a name in the SAM database
******************************************************************/
-static NTSTATUS testsam_getsampwnam (struct pdb_methods *methods, SAM_ACCOUNT *user, const char *sname)
+static NTSTATUS testsam_getsampwnam (struct pdb_methods *methods, struct samu *user, const char *sname)
{
DEBUG(10, ("testsam_getsampwnam called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
@@ -68,47 +68,47 @@
Search by sid
**************************************************************************/
-static NTSTATUS testsam_getsampwsid (struct pdb_methods *methods, SAM_ACCOUNT *user, const DOM_SID *sid)
+static NTSTATUS testsam_getsampwsid (struct pdb_methods *methods, struct samu *user, const DOM_SID *sid)
{
DEBUG(10, ("testsam_getsampwsid called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
/***************************************************************************
- Delete a SAM_ACCOUNT
+ Delete a struct samu
****************************************************************************/
-static NTSTATUS testsam_delete_sam_account(struct pdb_methods *methods, SAM_ACCOUNT *sam_pass)
+static NTSTATUS testsam_delete_sam_account(struct pdb_methods *methods, struct samu *sam_pass)
{
DEBUG(10, ("testsam_delete_sam_account called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
/***************************************************************************
- Modifies an existing SAM_ACCOUNT
+ Modifies an existing struct samu
****************************************************************************/
-static NTSTATUS testsam_update_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
+static NTSTATUS testsam_update_sam_account (struct pdb_methods *methods, struct samu *newpwd)
{
DEBUG(10, ("testsam_update_sam_account called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
/***************************************************************************
- Adds an existing SAM_ACCOUNT
+ Adds an existing struct samu
****************************************************************************/
-static NTSTATUS testsam_add_sam_account (struct pdb_methods *methods, SAM_ACCOUNT *newpwd)
+static NTSTATUS testsam_add_sam_account (struct pdb_methods *methods, struct samu *newpwd)
{
DEBUG(10, ("testsam_add_sam_account called\n"));
return NT_STATUS_NOT_IMPLEMENTED;
}
-NTSTATUS testsam_init(PDB_CONTEXT *pdb_context, PDB_METHODS **pdb_method, const char *location)
+NTSTATUS testsam_init(struct pdb_methods **pdb_method, const char *location)
{
NTSTATUS nt_status;
- if (!NT_STATUS_IS_OK(nt_status = make_pdb_methods(pdb_context->mem_ctx, pdb_method))) {
+ if (!NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method ))) {
return nt_status;
}
Modified: branches/SAMBA_3_0_24/packaging/Debian/debian-sarge/smb.conf
===================================================================
--- branches/SAMBA_3_0_24/packaging/Debian/debian-sarge/smb.conf 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/packaging/Debian/debian-sarge/smb.conf 2006-11-18 16:49:17 UTC (rev 19772)
@@ -81,7 +81,7 @@
# If you are using encrypted passwords, Samba will need to know what
# password database type you are using.
- passdb backend = tdbsam guest
+ passdb backend = tdbsam
obey pam restrictions = yes
Modified: branches/SAMBA_3_0_24/packaging/Debian/debian-woody/smb.conf
===================================================================
--- branches/SAMBA_3_0_24/packaging/Debian/debian-woody/smb.conf 2006-11-18 16:48:44 UTC (rev 19771)
+++ branches/SAMBA_3_0_24/packaging/Debian/debian-woody/smb.conf 2006-11-18 16:49:17 UTC (rev 19772)
@@ -81,7 +81,7 @@
# If you are using encrypted passwords, Samba will need to know what
# password database type you are using.
- passdb backend = tdbsam guest
+ passdb backend = tdbsam
obey pam restrictions = yes
More information about the samba-cvs
mailing list