Turbo Fredriksson wrote: >>>>>>"Taymour" == Taymour A El Erian <[EMAIL PROTECTED]> writes: >>>>>> >>>>>> > > Taymour> I have QmailLDAP v20020501a and QmailLDAP/Controls > Taymour> v20020524 > >Those work for me... Start fresh, and give me the output (and input, ie >commandlines) for what happens when you add the QmailLDAP/Controls patch... > > Taymour> Isn't there anyway you could sync the version > Taymour> no. so that no confusion will occur > >Not unless it's accepted 'upstream' (ie, by the QmailLDAP maintainers). > > Attached to this e-mail is the input/output for patch and the output from make. I really appreciate your help -- Taymour A El Erian System Division Manager T.E. Data E-mail: [EMAIL PROTECTED] Web: www.tedata.net Tel: +(202)-7494025 Ext: 1101
[xy@xz qmail-1.03]]#gzip -cd ~/src/qmail-ldap-control_20020524.patch.gz|patch -p2 patching file FILES patching file Makefile Hunk #48 FAILED at 1841. 1 out of 67 hunks FAILED -- saving rejects to file Makefile.rej patching file QLDAPINSTALL patching file QLDAPNEWS patching file QLDAPTODO patching file TARGETS patching file auth_imap.c patching file auth_pop.c patching file checkpassword.c patching file control.c patching file control.h patching file hier.c Hunk #1 succeeded at 102 (offset -2 lines). patching file install-big.c patching file ldapcfg.sh patching file pbsadd.c patching file pbscheck.c patching file pbsdbd.c patching file qldap-debug.c patching file qldap-errno.h patching file qldap-ldaplib.c patching file qmail-inject.c patching file qmail-ldap.h patching file qmail-ldaplookup.c patching file qmail-local.c Hunk #1 succeeded at 211 (offset -4 lines). patching file qmail-lspawn.c patching file qmail-pw2u.c patching file qmail-qmqpc.c patching file qmail-qmtpd.c patching file qmail-queue.c Hunk #1 succeeded at 70 (offset -1 lines). patching file qmail-remote.c patching file qmail-send.c Hunk #2 succeeded at 1615 (offset 6 lines). Hunk #4 succeeded at 1766 (offset 6 lines). patching file qmail-showctl.c patching file qmail-smtpd.c patching file qmail-todo.c patching file qmailControl.schema
( cat warn-auto.sh; \ echo CC=\'`head -1 conf-cc`\'; \ echo LD=\'`head -1 conf-ld`\' \ ) > auto-ccld.sh cat auto-ccld.sh make-load.sh > make-load chmod 755 make-load cat auto-ccld.sh find-systype.sh > find-systype chmod 755 find-systype ./find-systype > systype ( cat warn-auto.sh; ./make-load "`cat systype`" ) > load chmod 755 load cat auto-ccld.sh make-compile.sh > make-compile chmod 755 make-compile ( cat warn-auto.sh; ./make-compile "`cat systype`" ) > \ compile chmod 755 compile ( ( ./compile tryvfork.c && ./load tryvfork ) >/dev/null \ 2>&1 \ && cat fork.h2 || cat fork.h1 ) > fork.h rm -f tryvfork.o tryvfork ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT -DAUTOMAILDIRMAKE -DAUTOHOMEDIRMAKE qmail-local.c qmail-local.c: In function `main': qmail-local.c:621: warning: return type of `main' is not `int' ./compile qmail.c ./compile quote.c ./compile now.c ./compile gfrom.c ./compile myctime.c ./compile slurpclose.c cat auto-ccld.sh make-makelib.sh > make-makelib chmod 755 make-makelib ( cat warn-auto.sh; ./make-makelib "`cat systype`" ) > \ makelib chmod 755 makelib ./compile case_diffb.c ./compile case_diffs.c ./compile case_lowerb.c ./compile case_lowers.c ./compile case_starts.c ./makelib case.a case_diffb.o case_diffs.o case_lowerb.o \ case_lowers.o case_starts.o ./compile getln.c ./compile getln2.c ./makelib getln.a getln.o getln2.o ./compile subgetopt.c ./compile sgetopt.c ./makelib getopt.a subgetopt.o sgetopt.o ./compile sig_alarm.c ( ( ./compile trysgprm.c && ./load trysgprm ) >/dev/null \ 2>&1 \ && echo \#define HASSIGPROCMASK 1 || exit 0 ) > hassgprm.h rm -f trysgprm.o trysgprm ./compile sig_block.c ( ( ./compile trysgact.c && ./load trysgact ) >/dev/null \ 2>&1 \ && echo \#define HASSIGACTION 1 || exit 0 ) > hassgact.h rm -f trysgact.o trysgact ./compile sig_catch.c ./compile sig_pause.c ./compile sig_pipe.c ./compile sig_child.c ./compile sig_hup.c ./compile sig_term.c ./compile sig_bug.c ./compile sig_misc.c ./makelib sig.a sig_alarm.o sig_block.o sig_catch.o \ sig_pause.o sig_pipe.o sig_child.o sig_hup.o sig_term.o \ sig_bug.o sig_misc.o ./compile open_append.c ./compile open_excl.c ./compile open_read.c ./compile open_trunc.c ./compile open_write.c ./makelib open.a open_append.o open_excl.o open_read.o \ open_trunc.o open_write.o ./compile seek_cur.c ./compile seek_end.c ./compile seek_set.c ./compile seek_trunc.c ./makelib seek.a seek_cur.o seek_end.o seek_set.o \ seek_trunc.o ( ( ./compile tryflock.c && ./load tryflock ) >/dev/null \ 2>&1 \ && echo \#define HASFLOCK 1 || exit 0 ) > hasflock.h rm -f tryflock.o tryflock ./compile lock_ex.c ./compile lock_exnb.c ./compile lock_un.c ./makelib lock.a lock_ex.o lock_exnb.o lock_un.o ./compile fd_copy.c ./compile fd_move.c ./makelib fd.a fd_copy.o fd_move.o ( ( ./compile trywaitp.c && ./load trywaitp ) >/dev/null \ 2>&1 \ && echo \#define HASWAITPID 1 || exit 0 ) > haswaitp.h rm -f trywaitp.o trywaitp ./compile wait_pid.c ./compile wait_nohang.c ./makelib wait.a wait_pid.o wait_nohang.o ./compile env.c ./compile envread.c ./makelib env.a env.o envread.o ./compile stralloc_eady.c ./compile stralloc_pend.c ./compile stralloc_copy.c ./compile stralloc_opys.c ./compile stralloc_opyb.c ./compile stralloc_cat.c ./compile stralloc_cats.c ./compile stralloc_catb.c ./compile stralloc_arts.c ./makelib stralloc.a stralloc_eady.o stralloc_pend.o \ stralloc_copy.o stralloc_opys.o stralloc_opyb.o \ stralloc_cat.o stralloc_cats.o stralloc_catb.o \ stralloc_arts.o ./compile alloc.c ./compile alloc_re.c ./makelib alloc.a alloc.o alloc_re.o ./compile strerr_sys.c ./compile strerr_die.c ./makelib strerr.a strerr_sys.o strerr_die.o ./compile substdio.c ./compile substdi.c ./compile substdo.c ./compile subfderr.c ./compile subfdout.c ./compile subfdouts.c ./compile subfdin.c ./compile subfdins.c ./compile substdio_copy.c ./makelib substdio.a substdio.o substdi.o substdo.o \ subfderr.o subfdout.o subfdouts.o subfdin.o subfdins.o \ substdio_copy.o ./compile error.c ./compile error_str.c ./compile error_temp.c ./makelib error.a error.o error_str.o error_temp.o ./compile str_len.c ./compile str_diff.c ./compile str_diffn.c ./compile str_cpy.c ./compile str_chr.c ./compile str_rchr.c ./compile str_start.c ./compile byte_chr.c ./compile byte_rchr.c ./compile byte_diff.c ./compile byte_copy.c ./compile byte_cr.c ./compile byte_zero.c ./compile byte_repl.c ./makelib str.a str_len.o str_diff.o str_diffn.o str_cpy.o \ str_chr.o str_rchr.o str_start.o byte_chr.o byte_rchr.o \ byte_diff.o byte_copy.o byte_cr.o byte_zero.o byte_repl.o ./compile fmt_str.c ./compile fmt_strn.c ./compile fmt_uint.c ./compile fmt_uint0.c ./compile fmt_ulong.c ./compile scan_ulong.c ./compile scan_8long.c ./makelib fs.a fmt_str.o fmt_strn.o fmt_uint.o fmt_uint0.o \ fmt_ulong.o scan_ulong.o scan_8long.o ./compile datetime.c ./compile datetime_un.c ./makelib datetime.a datetime.o datetime_un.o ./compile auto-str.c auto-str.c: In function `main': auto-str.c:15: warning: return type of `main' is not `int' ./load auto-str substdio.a error.a str.a ./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c ./compile auto_qmail.c ./compile auto-int8.c auto-int8.c: In function `main': auto-int8.c:17: warning: return type of `main' is not `int' ./load auto-int8 substdio.a error.a str.a fs.a ./auto-int8 auto_patrn `head -1 conf-patrn` > auto_patrn.c ./compile auto_patrn.c ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT -I/usr/include control.c control.c: In function `control_ldap_search': control.c:281: warning: assignment from incompatible pointer type ( ( ./compile trylsock.c && \ ./load trylsock -lsocket -lnsl ) >/dev/null 2>&1 \ && echo -lsocket -lnsl || exit 0 ) > socket.lib rm -f trylsock.o trylsock ( ./compile trydrent.c >/dev/null 2>&1 \ && cat direntry.h2 || cat direntry.h1 ) > direntry.h rm -f trydrent.o ./compile maildir++.c ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT -I/usr/include qldap-ldaplib.c ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT qldap-debug.c ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT -DAUTOHOMEDIRMAKE -DAUTOMAILDIRMAKE qldap-mdm.c ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT qldap-errno.c ./makelib qldap.a qldap-ldaplib.o qldap-debug.o qldap-mdm.o \ qldap-errno.o envread.o ./load qmail-local qmail.o quote.o maildir++.o now.o gfrom.o myctime.o \ slurpclose.o case.a getln.a getopt.a sig.a open.a seek.a \ lock.a fd.a wait.a env.a stralloc.a alloc.a strerr.a substdio.a \ qldap.a error.a str.a fs.a datetime.a auto_qmail.o \ auto_patrn.o `cat socket.lib` ( ( ./compile tryulong32.c && ./load tryulong32 && \ ./tryulong32 ) >/dev/null 2>&1 \ && cat uint32.h2 || cat uint32.h1 ) > uint32.h rm -f tryulong32.o tryulong32 ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT -DAUTOHOMEDIRMAKE -I/usr/include qmail-lspawn.c ( ./compile trysysel.c >/dev/null 2>&1 \ && cat select.h2 || cat select.h1 ) > select.h rm -f trysysel.o trysysel ./compile chkspawn.c chkspawn.c: In function `main': chkspawn.c:12: warning: return type of `main' is not `int' ./compile auto-int.c auto-int.c: In function `main': auto-int.c:17: warning: return type of `main' is not `int' ./load auto-int substdio.a error.a str.a fs.a ./auto-int auto_spawn `head -1 conf-spawn` > auto_spawn.c ./compile auto_spawn.c ./load chkspawn substdio.a error.a str.a fs.a auto_spawn.o ./chkspawn ./compile -DDEBUG spawn.c spawn.c: In function `main': spawn.c:186: warning: return type of `main' is not `int' ./compile chkshsgr.c chkshsgr.c: In function `main': chkshsgr.c:3: warning: return type of `main' is not `int' ./load chkshsgr ./chkshsgr || ( cat warn-shsgr; exit 1 ) ( ( ./compile tryshsgr.c \ && ./load tryshsgr && ./tryshsgr ) >/dev/null 2>&1 \ && echo \#define HASSHORTSETGROUPS 1 || exit 0 ) > \ hasshsgr.h rm -f tryshsgr.o tryshsgr ./compile prot.c ./compile coe.c ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT check.c ./compile cdb_hash.c ./compile cdb_unpack.c ./compile cdb_seek.c ./makelib cdb.a cdb_hash.o cdb_unpack.o cdb_seek.o ./compile auto-uid.c auto-uid.c: In function `main': auto-uid.c:20: warning: return type of `main' is not `int' ./load auto-uid substdio.a error.a str.a fs.a ./compile auto-gid.c auto-gid.c: In function `main': auto-gid.c:20: warning: return type of `main' is not `int' ./load auto-gid substdio.a error.a str.a fs.a ( ./auto-uid auto_uida `head -1 conf-users` \ &&./auto-uid auto_uidd `head -2 conf-users | tail -1` \ &&./auto-uid auto_uidl `head -3 conf-users | tail -1` \ &&./auto-uid auto_uido `head -4 conf-users | tail -1` \ &&./auto-uid auto_uidp `head -5 conf-users | tail -1` \ &&./auto-uid auto_uidq `head -6 conf-users | tail -1` \ &&./auto-uid auto_uidr `head -7 conf-users | tail -1` \ &&./auto-uid auto_uids `head -8 conf-users | tail -1` \ &&./auto-gid auto_gidq `head -1 conf-groups` \ &&./auto-gid auto_gidn `head -2 conf-groups | tail -1` \ ) > auto_uids.c.tmp && mv auto_uids.c.tmp auto_uids.c ./compile auto_uids.c ./auto-str auto_usera `head -1 conf-users` > auto_usera.c ./compile auto_usera.c ./compile output.c ./auto-str auto_break \ "`head -1 conf-break`" > auto_break.c ./compile auto_break.c ./compile constmap.c ./load qmail-lspawn spawn.o prot.o slurpclose.o coe.o control.o \ check.o output.o sig.a strerr.a constmap.o qldap.a getln.a wait.a \ case.a cdb.a fd.a seek.a open.a env.a stralloc.a alloc.a substdio.a \ str.a error.a fs.a qldap.a auto_qmail.o auto_uids.o auto_usera.o \ auto_spawn.o auto_break.o -lldap -llber ./compile qmail-getpw.c qmail-getpw.c: In function `main': qmail-getpw.c:59: warning: return type of `main' is not `int' ./load qmail-getpw case.a substdio.a error.a str.a fs.a \ auto_break.o auto_usera.o ./compile qmail-remote.c qmail-remote.c: In function `main': qmail-remote.c:727: warning: return type of `main' is not `int' ./compile timeoutread.c ./compile timeoutwrite.c ./compile timeoutconn.c ./compile tcpto.c ./compile dns.c ./compile ip.c ./compile ipalloc.c ( ./compile trysalen.c >/dev/null 2>&1 \ && echo \#define HASSALEN 1 || exit 0 ) > hassalen.h rm -f trysalen.o ./compile ipme.c ./compile ndelay.c ./compile ndelay_off.c ./makelib ndelay.a ndelay.o ndelay_off.o ( ( ./compile tryrsolv.c && ./load tryrsolv dns.o \ ipalloc.o ip.o stralloc.a alloc.a error.a fs.a str.a \ -lresolv `cat socket.lib` ) >/dev/null 2>&1 \ && echo -lresolv || exit 0 ) > dns.lib rm -f tryrsolv.o tryrsolv ./load qmail-remote control.o constmap.o timeoutread.o \ timeoutwrite.o timeoutconn.o tcpto.o now.o dns.o ip.o \ ipalloc.o ipme.o quote.o output.o ndelay.a case.a sig.a qldap.a \ open.a lock.a seek.a getln.a stralloc.a alloc.a substdio.a error.a \ str.a fs.a auto_qmail.o `cat dns.lib` `cat socket.lib` \ -lldap -llber ./compile qmail-rspawn.c ./compile tcpto_clean.c ./load qmail-rspawn spawn.o tcpto_clean.o now.o coe.o \ sig.a open.a seek.a lock.a wait.a fd.a stralloc.a alloc.a \ substdio.a error.a str.a auto_qmail.o auto_uids.o \ auto_spawn.o ./compile qmail-clean.c qmail-clean.c: In function `main': qmail-clean.c:53: warning: return type of `main' is not `int' ./compile fmtqfn.c ./auto-int auto_split `head -1 conf-split` > auto_split.c ./compile auto_split.c ./load qmail-clean fmtqfn.o now.o getln.a sig.a stralloc.a \ alloc.a substdio.a error.a str.a fs.a auto_qmail.o \ auto_split.o ./compile -DEXTERNAL_TODO -DDEBUG -DUSE_CONTROLDB -DQLDAP_BAILOUT qmail-send.c qmail-send.c: In function `main': qmail-send.c:1761: warning: return type of `main' is not `int' ./compile qsutil.c ./compile newfield.c ./compile prioq.c ( ( ./compile trymkffo.c && ./load trymkffo ) >/dev/null \ 2>&1 \ && echo \#define HASMKFIFO 1 || exit 0 ) > hasmkffo.h rm -f trymkffo.o trymkffo ./compile fifo.c ( ( ./compile trynpbg1.c \ && ./load trynpbg1 fifo.o open.a && ./trynpbg1 ) \ >/dev/null 2>&1 \ && echo \#define HASNAMEDPIPEBUG1 1 || exit 0 ) > \ hasnpbg1.h rm -f trynpbg1.o trynpbg1 ./compile trigger.c ./compile readsubdir.c ./compile date822fmt.c ./load qmail-send qsutil.o control.o constmap.o newfield.o \ prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \ qmail.o date822fmt.o datetime.a case.a ndelay.a getln.a \ wait.a seek.a fd.a sig.a open.a lock.a stralloc.a alloc.a \ substdio.a error.a str.a fs.a auto_qmail.o auto_split.o qmail-send.o: In function `main': qmail-send.o(.text+0x34df): undefined reference to `log_init' control.o: In function `control_readline': control.o(.text+0xf2): undefined reference to `log' control.o: In function `control_ldap_search': control.o(.text+0x643): undefined reference to `qldap_open' control.o(.text+0x656): undefined reference to `log' control.o(.text+0x6e0): undefined reference to `qldap_me' control.o(.text+0x6f1): undefined reference to `qldap_me' control.o(.text+0x715): undefined reference to `qldap_me' control.o(.text+0x759): undefined reference to `qldap_me' control.o(.text+0x7c8): undefined reference to `log' control.o(.text+0x7eb): undefined reference to `ldap_search_s' control.o(.text+0x7fb): undefined reference to `ldap_err2string' control.o(.text+0x80e): undefined reference to `log' control.o(.text+0x861): undefined reference to `ldap_count_entries' control.o(.text+0x9c9): undefined reference to `log' control.o(.text+0x9e5): undefined reference to `ldap_search_s' control.o(.text+0x9f5): undefined reference to `ldap_err2string' control.o(.text+0xa05): undefined reference to `log' control.o(.text+0xa59): undefined reference to `ldap_count_entries' control.o(.text+0xa76): undefined reference to `log' control.o(.text+0xa86): undefined reference to `ldap_first_entry' control.o(.text+0xa96): undefined reference to `ldap_get_dn' control.o(.text+0xaa6): undefined reference to `ldap_memfree' control.o(.text+0xab8): undefined reference to `ldap_get_values' control.o(.text+0xb22): undefined reference to `log' control.o(.text+0xc18): undefined reference to `ldap_value_free' collect2: ld returned 1 exit status make: *** [qmail-send] Error 1
