summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-11-07 15:52:30 +0000
committerGerald Carter <jerry@samba.org>2003-11-07 15:52:30 +0000
commit16609b588b9703f9e12a0b6252dc31bfa9911b99 (patch)
tree3f7212610daef334f063a424e49036dba763e853 /examples
parent53d8dfad13e2063ee1161ad4e8ff98683725cbdf (diff)
downloadsamba-16609b588b9703f9e12a0b6252dc31bfa9911b99.tar.gz
samba-16609b588b9703f9e12a0b6252dc31bfa9911b99.tar.xz
samba-16609b588b9703f9e12a0b6252dc31bfa9911b99.zip
syncing tree with SAMBA_3_0
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/LDAP/convertSambaAccount6
-rw-r--r--examples/libsmbclient/Makefile13
-rw-r--r--examples/libsmbclient/tree.c4
3 files changed, 18 insertions, 5 deletions
diff --git a/examples/LDAP/convertSambaAccount b/examples/LDAP/convertSambaAccount
index e00d0a2326e..4357dbc8f8d 100755
--- a/examples/LDAP/convertSambaAccount
+++ b/examples/LDAP/convertSambaAccount
@@ -9,6 +9,12 @@
## --input=<input ldif> --output=<output ldif> \
## --changetype=[modify|add]
##
+## You can generate an input ldif file using:
+## $ ldapsearch -LL -x -h ldapsrv -D cn=root,dc=company,dc=com \
+## -b dc=copmany,dc=com > /tmp/samba3.alpha23.ldif
+##
+## Note the "-LL" so no additional comments are generated
+##
use strict;
diff --git a/examples/libsmbclient/Makefile b/examples/libsmbclient/Makefile
index 5fe9977c0ae..e7c82a3aee6 100644
--- a/examples/libsmbclient/Makefile
+++ b/examples/libsmbclient/Makefile
@@ -2,16 +2,19 @@
CC = gcc
SAMBA_INCL = ../../source/include
+EXTLIB_INCL = -I/usr/include/gtk-1.2 \
+ -I/usr/include/glib-1.2 \
+ -I/usr/lib/glib/include
-CFLAGS = -I$(SAMBA_INCL)
+CFLAGS = -I$(SAMBA_INCL) $(EXTLIB_INCL)
LDFLAGS = -L/usr/lib
-all: testsmbc tree
+all: testsmbc tree testacl
testsmbc: testsmbc.o
@echo Linking testsmbc
- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsmbclient -L/usr/local/lib
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsmbclient -L/usr/local/lib
testsmbc-static: testsmbc.o
@echo Linking testsmbc
@@ -21,5 +24,9 @@ tree: tree.o
@echo Linking tree
@$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` -lsmbclient $<
+testacl: testacl.o
+ @echo Linking testacl
+ @$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` -lsmbclient -lpopt $<
+
clean:
@rm -f *.o *~
diff --git a/examples/libsmbclient/tree.c b/examples/libsmbclient/tree.c
index 8dc9cc408b3..f50b3670cff 100644
--- a/examples/libsmbclient/tree.c
+++ b/examples/libsmbclient/tree.c
@@ -706,9 +706,9 @@ int main( int argc,
/* Now, build the top level display ... */
- if ((dh = smbc_opendir("smb:///")) < 0) {
+ if ((dh = smbc_opendir("smb://")) < 0) {
- fprintf(stderr, "Could not list default workgroup: smb:///: %s\n",
+ fprintf(stderr, "Could not list workgroups: smb://: %s\n",
strerror(errno));
exit(1);