|
From: <ctr...@us...> - 2006-07-23 19:52:26
|
Revision: 65 Author: ctrlsoft Date: 2006-07-23 12:51:55 -0700 (Sun, 23 Jul 2006) ViewCVS: http://svn.sourceforge.net/pdbsql/?rev=65&view=rev Log Message: ----------- Get rid of obsolete CVSROOT directory and remove now no longer necessary `samba-pdbsql` directory. Added Paths: ----------- trunk/AUTHORS trunk/COPYING trunk/Makefile.in trunk/aclocal.m4 trunk/autogen.sh trunk/config.guess trunk/config.sub trunk/configure.in trunk/debian/ trunk/docs/ trunk/install-sh trunk/pdb_multi.c trunk/pdb_mysql.c trunk/pdb_pgsql.c trunk/pdb_sql.c trunk/pdb_sql.h Removed Paths: ------------- trunk/CVSROOT/ trunk/samba-pdbsql/ Copied: trunk/AUTHORS (from rev 64, trunk/samba-pdbsql/AUTHORS) =================================================================== --- trunk/AUTHORS (rev 0) +++ trunk/AUTHORS 2006-07-23 19:51:55 UTC (rev 65) @@ -0,0 +1,3 @@ +Jelmer Vernooij <je...@sa...> +Wilco Baan Hofman +Hamish Friedlander Copied: trunk/COPYING (from rev 64, trunk/samba-pdbsql/COPYING) =================================================================== --- trunk/COPYING (rev 0) +++ trunk/COPYING 2006-07-23 19:51:55 UTC (rev 65) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Copied: trunk/Makefile.in (from rev 64, trunk/samba-pdbsql/Makefile.in) =================================================================== --- trunk/Makefile.in (rev 0) +++ trunk/Makefile.in 2006-07-23 19:51:55 UTC (rev 65) @@ -0,0 +1,43 @@ +# Makefile for experimental pdb modules + +CC = @CC@ +INSTALL = @INSTALL@ + +SHLIBEXT = @SHLIBEXT@ + +modules = multi @modules@ + +MYSQL_LIBS = @MYSQL_LIBS@ +PGSQL_LIBS = @PGSQL_LIBS@ +SOURCEDIR = @SOURCEDIR@ +LIBDIR = @LIBDIR@ +CFLAGS = -Wall @CFLAGS@ -I$(SOURCEDIR) -I$(SOURCEDIR)/include -I$(SOURCEDIR)/ubiqx -I$(SOURCEDIR)/popt + +all: $(addsuffix .$(SHLIBEXT), $(modules)) + +.c.o: + $(CC) $(CFLAGS) -fPIC -c $< + +mysql.$(SHLIBEXT): pdb_mysql.o pdb_sql.o + $(CC) -shared -o $@ $^ $(MYSQL_LIBS) + +pgsql.$(SHLIBEXT): pdb_pgsql.o pdb_sql.o + $(CC) -shared -o $@ $^ $(PGSQL_LIBS) + +multi.$(SHLIBEXT): pdb_multi.o + $(CC) -shared -o $@ $^ + +Makefile: Makefile.in config.status + ./config.status + +clean: + rm -f *.o *.$(SHLIBEXT) + +install: + $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pdb + $(INSTALL) -m 0755 $(addsuffix .$(SHLIBEXT), $(modules)) $(DESTDIR)$(LIBDIR)/pdb + +distclean: clean + rm -rf autom4te.cache config.cache config.status + rm -f config.h Makefile config.log + rm -f *~ Copied: trunk/aclocal.m4 (from rev 64, trunk/samba-pdbsql/aclocal.m4) =================================================================== --- trunk/aclocal.m4 (rev 0) +++ trunk/aclocal.m4 2006-07-23 19:51:55 UTC (rev 65) @@ -0,0 +1,91 @@ +# ========================================================================= +# AM_PATH_MYSQL : MySQL library + +dnl AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS +dnl +AC_DEFUN(AM_PATH_MYSQL, +[dnl +dnl Get the cflags and libraries from the mysql_config script +dnl +AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MYSQL is installed (optional)], + mysql_prefix="$withval", mysql_prefix="") +AC_ARG_WITH(mysql-exec-prefix,[ --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)], + mysql_exec_prefix="$withval", mysql_exec_prefix="") + + if test x$mysql_exec_prefix != x ; then + mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix" + if test x${MYSQL_CONFIG+set} != xset ; then + MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config + fi + fi + if test x$mysql_prefix != x ; then + mysql_args="$mysql_args --prefix=$mysql_prefix" + if test x${MYSQL_CONFIG+set} != xset ; then + MYSQL_CONFIG=$mysql_prefix/bin/mysql_config + fi + fi + + AC_REQUIRE([AC_CANONICAL_TARGET]) + AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no) + AC_MSG_CHECKING(for MYSQL) + no_mysql="" + if test "$MYSQL_CONFIG" = "no" ; then + MYSQL_CFLAGS="" + MYSQL_LIBS="" + AC_MSG_RESULT(no) + ifelse([$2], , :, [$2]) + else + MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"` + MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"` + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + fi + AC_SUBST(MYSQL_CFLAGS) + AC_SUBST(MYSQL_LIBS) +]) + +# ========================================================================= +# AM_PATH_PGSQL : pgSQL library + +dnl AM_PATH_PGSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for PGSQL, and define PGSQL_CFLAGS and PGSQL_LIBS +dnl +AC_DEFUN(AM_PATH_PGSQL, +[dnl +dnl Get the cflags and libraries from the pg_config script +dnl +AC_ARG_WITH(pgsql-prefix,[ --with-pgsql-prefix=PFX Prefix where PostgreSQL is installed (optional)], + pgsql_prefix="$withval", pgsql_prefix="") +AC_ARG_WITH(pgsql-exec-prefix,[ --with-pgsql-exec-prefix=PFX Exec prefix where PostgreSQL is installed (optional)], + pgsql_exec_prefix="$withval", pgsql_exec_prefix="") + + if test x$pgsql_exec_prefix != x ; then + if test x${PGSQL_CONFIG+set} != xset ; then + PGSQL_CONFIG=$pgsql_exec_prefix/bin/pg_config + fi + fi + if test x$pgsql_prefix != x ; then + if test x${PGSQL_CONFIG+set} != xset ; then + PGSQL_CONFIG=$pgsql_prefix/bin/pg_config + fi + fi + + AC_REQUIRE([AC_CANONICAL_TARGET]) + AC_PATH_PROG(PGSQL_CONFIG, pg_config, no, [$PATH:/usr/lib/postgresql/bin]) + AC_MSG_CHECKING(for PGSQL) + no_pgsql="" + if test "$PGSQL_CONFIG" = "no" ; then + PGSQL_CFLAGS="" + PGSQL_LIBS="" + AC_MSG_RESULT(no) + ifelse([$2], , :, [$2]) + else + PGSQL_CFLAGS=-I`$PGSQL_CONFIG --includedir` + PGSQL_LIBS="-lpq -L`$PGSQL_CONFIG --libdir`" + AC_MSG_RESULT(yes) + ifelse([$1], , :, [$1]) + fi + AC_SUBST(PGSQL_CFLAGS) + AC_SUBST(PGSQL_LIBS) +]) Copied: trunk/autogen.sh (from rev 64, trunk/samba-pdbsql/autogen.sh) =================================================================== --- trunk/autogen.sh (rev 0) +++ trunk/autogen.sh 2006-07-23 19:51:55 UTC (rev 65) @@ -0,0 +1,2 @@ +#!/bin/sh +autoreconf -i Copied: trunk/config.guess (from rev 64, trunk/samba-pdbsql/config.guess) =================================================================== --- trunk/config.guess (rev 0) +++ trunk/config.guess 2006-07-23 19:51:55 UTC (rev 65) @@ -0,0 +1,1497 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +timestamp='2006-02-23' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + + +# Originally written by Per Bothner <pe...@bo...>. +# Please send patches to <con...@gn...>. Submit a context +# diff and a properly formatted ChangeLog entry. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <con...@gn...>." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (gh...@no... 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* w... [truncated message content] |
|
From: <sy...@us...> - 2006-08-20 19:29:00
|
Revision: 68 Author: synnack Date: 2006-08-20 12:28:53 -0700 (Sun, 20 Aug 2006) ViewCVS: http://svn.sourceforge.net/pdbsql/?rev=68&view=rev Log Message: ----------- Add password history feature and update documentation. Fix logon hours handling in mysql. Some formatting fixes. Modified Paths: -------------- trunk/docs/mysql.dump trunk/docs/pgsql.dump trunk/pdb_mysql.c trunk/pdb_pgsql.c trunk/pdb_sql.c Modified: trunk/docs/mysql.dump =================================================================== --- trunk/docs/mysql.dump 2006-08-20 10:44:44 UTC (rev 67) +++ trunk/docs/mysql.dump 2006-08-20 19:28:53 UTC (rev 68) @@ -33,5 +33,6 @@ bad_password_count int(9) default NULL, logon_count int(9) default '0', logon_hours varchar(42) default NULL, + password_history text default NULL, KEY username(username) ); Modified: trunk/docs/pgsql.dump =================================================================== --- trunk/docs/pgsql.dump 2006-08-20 10:44:44 UTC (rev 67) +++ trunk/docs/pgsql.dump 2006-08-20 19:28:53 UTC (rev 68) @@ -1,3 +1,6 @@ +/* + * Import this file with psql < pgsql.dump + */ CREATE TABLE users ( logon_time integer default NULL, logoff_time integer default NULL, @@ -30,6 +33,7 @@ bad_password_count integer default NULL, logon_count integer default '0', logon_hours varchar(42) default NULL, + password_history text default NULL, UNIQUE (username), UNIQUE (nt_username) ); Modified: trunk/pdb_mysql.c =================================================================== --- trunk/pdb_mysql.c 2006-08-20 10:44:44 UTC (rev 67) +++ trunk/pdb_mysql.c 2006-08-20 19:28:53 UTC (rev 68) @@ -140,6 +140,20 @@ pdb_set_bad_password_count(u, xatol(row[26]), PDB_SET); pdb_set_logon_count(u, xatol(row[27]), PDB_SET); pdb_set_unknown_6(u, xatol(row[28]), PDB_SET); + pdb_set_hours(u, (uint8 *)row[29], PDB_SET); + + if (row[30]) { + uint8 pwhist[MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN]; + int i; + + memset(&pwhist, 0, MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN); + for (i = 0; i < MAX_PW_HISTORY_LEN && i < strlen(row[30])/64; i++) { + pdb_gethexpwd(&(row[30])[i*64], &pwhist[i*PW_HISTORY_ENTRY_LEN]); + pdb_gethexpwd(&(row[30])[i*64+32], + &pwhist[i*PW_HISTORY_ENTRY_LEN+PW_HISTORY_SALT_LEN]); + } + pdb_set_pw_history(u, pwhist, strlen(row[30])/64, PDB_SET); + } return NT_STATUS_OK; } Modified: trunk/pdb_pgsql.c =================================================================== --- trunk/pdb_pgsql.c 2006-08-20 10:44:44 UTC (rev 67) +++ trunk/pdb_pgsql.c 2006-08-20 19:28:53 UTC (rev 68) @@ -176,9 +176,9 @@ hours = PQunescapeBytea ( hours, &hours_len ) ; if ( hours_len > 0 ) pdb_set_hours ( u, hours, PDB_SET ) ; - free ( hours ); } + if ( !PQgetisnull( r, row, 18 ) ) { string_to_sid( &sid, PQgetvalue( r, row, 18 ) ) ; pdb_set_user_sid ( u, &sid, PDB_SET ) ; @@ -191,6 +191,21 @@ if ( pdb_gethexpwd( PQgetvalue( r, row, 20 ), temp ), PDB_SET ) pdb_set_lanman_passwd( u, temp, PDB_SET ) ; if ( pdb_gethexpwd( PQgetvalue( r, row, 21 ), temp ), PDB_SET ) pdb_set_nt_passwd ( u, temp, PDB_SET ) ; + + if (!PQgetisnull( r, row, 30 ) ) { + uint8 pwhist[MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN]; + int i; + char *history_string = PQgetvalue( r, row, 30); + + memset(&pwhist, 0, MAX_PW_HISTORY_LEN * PW_HISTORY_ENTRY_LEN); + for (i = 0; i < MAX_PW_HISTORY_LEN && i < strlen(history_string)/64; i++) { + pdb_gethexpwd(&(history_string)[i*64], &pwhist[i*PW_HISTORY_ENTRY_LEN]); + pdb_gethexpwd(&(history_string)[i*64+32], + &pwhist[i*PW_HISTORY_ENTRY_LEN+PW_HISTORY_SALT_LEN]); + } + pdb_set_pw_history(u, pwhist, strlen(history_string)/64, PDB_SET); + } + /* Only use plaintext password storage when lanman and nt are NOT used */ if ( PQgetisnull( r, row, 20 ) || PQgetisnull( r, row, 21 ) ) pdb_set_plaintext_passwd( u, PQgetvalue( r, row, 22 ) ) ; Modified: trunk/pdb_sql.c =================================================================== --- trunk/pdb_sql.c 2006-08-20 10:44:44 UTC (rev 67) +++ trunk/pdb_sql.c 2006-08-20 19:28:53 UTC (rev 68) @@ -49,7 +49,8 @@ #define CONFIG_BAD_PASSWORD_COUNT_DEFAULT "bad_password_count" #define CONFIG_LOGON_COUNT_DEFAULT "logon_count" #define CONFIG_UNKNOWN_6_DEFAULT "unknown_6" -#define CONFIG_LOGON_HOURS "logon_hours" +#define CONFIG_LOGON_HOURS_DEFAULT "logon_hours" +#define CONFIG_PASSWORD_HISTORY_DEFAULT "password_history" /* Used to construct insert and update queries */ @@ -213,7 +214,7 @@ } query = talloc_asprintf(mem_ctx, - "SELECT %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s FROM %s WHERE %s = '%s'", + "SELECT %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s FROM %s WHERE %s = '%s'", config_value_read(data, "logon time column", CONFIG_LOGON_TIME_DEFAULT), config_value_read(data, "logoff time column", @@ -273,7 +274,9 @@ config_value_read(data, "unknown 6 column", CONFIG_UNKNOWN_6_DEFAULT), config_value_read(data, "logon hours column", - CONFIG_LOGON_HOURS), + CONFIG_LOGON_HOURS_DEFAULT), + config_value_read(data, "password history column", + CONFIG_PASSWORD_HISTORY_DEFAULT), config_value(data, "table", CONFIG_TABLE_DEFAULT), field_string, value ); @@ -467,7 +470,6 @@ CONFIG_PROFILE_PATH_DEFAULT), pdb_get_profile_path(newpwd)); } -/* acct_desc update [C] */ if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_ACCTDESC)) { some_field_affected = 1; pdb_sql_string_field(query, @@ -492,9 +494,6 @@ pdb_get_homedir(newpwd)); } - -/* */ - if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_WORKSTATIONS)) { some_field_affected = 1; pdb_sql_string_field(query, @@ -537,10 +536,33 @@ pdb_sql_string_field(query, config_value_write(location, "logon hours column", - CONFIG_LOGON_HOURS), + CONFIG_LOGON_HOURS_DEFAULT), (const char *)pdb_get_hours(newpwd)); } + if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_PWHISTORY)) { + uint32 pw_history_len = 0; + uint32 max_history_len = 0; + int i; + const uint8 *pwhist; + + pwhist = pdb_get_pw_history(newpwd, &pw_history_len); + + pdb_get_account_policy(AP_PASSWORD_HISTORY, &max_history_len); + + some_field_affected = 1; + for (i = 0; i < max_history_len && i < pw_history_len; i++) { + pdb_sethexpwd(&temp[i*64], &pwhist[i*PW_HISTORY_ENTRY_LEN], 0); + pdb_sethexpwd(&temp[i*64+32], + &pwhist[(i*PW_HISTORY_ENTRY_LEN)+PW_HISTORY_SALT_LEN], 0); + } + pdb_sql_string_field(query, + config_value_write(location, + "password history column", + CONFIG_PASSWORD_HISTORY_DEFAULT), + temp); + } + if (!some_field_affected) { talloc_free(query); return NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sy...@us...> - 2007-01-16 08:52:09
|
Revision: 71
http://svn.sourceforge.net/pdbsql/?rev=71&view=rev
Author: synnack
Date: 2007-01-16 00:51:22 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
Add TODO line regarding new feature implemented in pdb by volker this morning.
Modified Paths:
--------------
trunk/pdb_multi.c
trunk/pdb_mysql.c
trunk/pdb_pgsql.c
Modified: trunk/pdb_multi.c
===================================================================
--- trunk/pdb_multi.c 2006-08-20 20:09:14 UTC (rev 70)
+++ trunk/pdb_multi.c 2007-01-16 08:51:22 UTC (rev 71)
@@ -16,6 +16,14 @@
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 675
* Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO
+ * * Volker commited Turst domain passwords to be included in the pdb.
+ * These need to be added here:
+ * BOOL get_trusteddom_pw(struct pdb_methods *methods, const char *domain, char **pwd, DOM_SID *sid, time_t *pass_last_set_time)
+ * BOOL set_trusteddom_pw(struct pdb_methods *methods, const char *domain, const char *pwd, const DOM_SID *sid)
+ * BOOL del_trusteddom_pw(struct pdb_methods *methods, const char *domain)
+ * NTSTATUS enum_trusteddoms(struct pdb_methods *methods, TALLOC_CTX *mem_ctx, uint32 *num_domains, struct trustdom_info ***domains)
*/
#include "includes.h"
Modified: trunk/pdb_mysql.c
===================================================================
--- trunk/pdb_mysql.c 2006-08-20 20:09:14 UTC (rev 70)
+++ trunk/pdb_mysql.c 2007-01-16 08:51:22 UTC (rev 71)
@@ -16,6 +16,14 @@
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 675
* Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO
+ * * Volker commited Turst domain passwords to be included in the pdb.
+ * These need to be added here:
+ * BOOL get_trusteddom_pw(struct pdb_methods *methods, const char *domain, char **pwd, DOM_SID *sid, time_t *pass_last_set_time)
+ * BOOL set_trusteddom_pw(struct pdb_methods *methods, const char *domain, const char *pwd, const DOM_SID *sid)
+ * BOOL del_trusteddom_pw(struct pdb_methods *methods, const char *domain)
+ * NTSTATUS enum_trusteddoms(struct pdb_methods *methods, TALLOC_CTX *mem_ctx, uint32 *num_domains, struct trustdom_info ***domains)
*/
#include "pdb_sql.h"
Modified: trunk/pdb_pgsql.c
===================================================================
--- trunk/pdb_pgsql.c 2006-08-20 20:09:14 UTC (rev 70)
+++ trunk/pdb_pgsql.c 2007-01-16 08:51:22 UTC (rev 71)
@@ -17,6 +17,14 @@
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 675
* Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO
+ * * Volker commited Turst domain passwords to be included in the pdb.
+ * These need to be added here:
+ * BOOL get_trusteddom_pw(struct pdb_methods *methods, const char *domain, char **pwd, DOM_SID *sid, time_t *pass_last_set_time)
+ * BOOL set_trusteddom_pw(struct pdb_methods *methods, const char *domain, const char *pwd, const DOM_SID *sid)
+ * BOOL del_trusteddom_pw(struct pdb_methods *methods, const char *domain)
+ * NTSTATUS enum_trusteddoms(struct pdb_methods *methods, TALLOC_CTX *mem_ctx, uint32 *num_domains, struct trustdom_info ***domains)
*/
#include "pdb_sql.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sy...@us...> - 2007-01-16 08:54:22
|
Revision: 72
http://svn.sourceforge.net/pdbsql/?rev=72&view=rev
Author: synnack
Date: 2007-01-16 00:53:37 -0800 (Tue, 16 Jan 2007)
Log Message:
-----------
Sorry, I meant Trust passwords ;)
Modified Paths:
--------------
trunk/pdb_multi.c
trunk/pdb_mysql.c
trunk/pdb_pgsql.c
Modified: trunk/pdb_multi.c
===================================================================
--- trunk/pdb_multi.c 2007-01-16 08:51:22 UTC (rev 71)
+++ trunk/pdb_multi.c 2007-01-16 08:53:37 UTC (rev 72)
@@ -18,7 +18,7 @@
* Mass Ave, Cambridge, MA 02139, USA.
*
* TODO
- * * Volker commited Turst domain passwords to be included in the pdb.
+ * * Volker commited Trust domain passwords to be included in the pdb.
* These need to be added here:
* BOOL get_trusteddom_pw(struct pdb_methods *methods, const char *domain, char **pwd, DOM_SID *sid, time_t *pass_last_set_time)
* BOOL set_trusteddom_pw(struct pdb_methods *methods, const char *domain, const char *pwd, const DOM_SID *sid)
Modified: trunk/pdb_mysql.c
===================================================================
--- trunk/pdb_mysql.c 2007-01-16 08:51:22 UTC (rev 71)
+++ trunk/pdb_mysql.c 2007-01-16 08:53:37 UTC (rev 72)
@@ -18,7 +18,7 @@
* Mass Ave, Cambridge, MA 02139, USA.
*
* TODO
- * * Volker commited Turst domain passwords to be included in the pdb.
+ * * Volker commited Trust domain passwords to be included in the pdb.
* These need to be added here:
* BOOL get_trusteddom_pw(struct pdb_methods *methods, const char *domain, char **pwd, DOM_SID *sid, time_t *pass_last_set_time)
* BOOL set_trusteddom_pw(struct pdb_methods *methods, const char *domain, const char *pwd, const DOM_SID *sid)
Modified: trunk/pdb_pgsql.c
===================================================================
--- trunk/pdb_pgsql.c 2007-01-16 08:51:22 UTC (rev 71)
+++ trunk/pdb_pgsql.c 2007-01-16 08:53:37 UTC (rev 72)
@@ -19,7 +19,7 @@
* Mass Ave, Cambridge, MA 02139, USA.
*
* TODO
- * * Volker commited Turst domain passwords to be included in the pdb.
+ * * Volker commited Trust domain passwords to be included in the pdb.
* These need to be added here:
* BOOL get_trusteddom_pw(struct pdb_methods *methods, const char *domain, char **pwd, DOM_SID *sid, time_t *pass_last_set_time)
* BOOL set_trusteddom_pw(struct pdb_methods *methods, const char *domain, const char *pwd, const DOM_SID *sid)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <co...@us...> - 2008-06-12 13:14:54
|
Revision: 93
http://pdbsql.svn.sourceforge.net/pdbsql/?rev=93&view=rev
Author: collen
Date: 2008-06-12 06:15:00 -0700 (Thu, 12 Jun 2008)
Log Message:
-----------
Updates for 0.3.2
-include pdb_comment patch (0.3.1)
- start of pgsql fix
Modified Paths:
--------------
trunk/AUTHORS
trunk/Makefile.in
trunk/pdb_mysql.c
trunk/pdb_pgsql.c
trunk/pdb_sql.c
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2008-01-10 09:09:21 UTC (rev 92)
+++ trunk/AUTHORS 2008-06-12 13:15:00 UTC (rev 93)
@@ -1,3 +1,4 @@
Jelmer Vernooij <je...@sa...>
Wilco Baan Hofman
Hamish Friedlander
+Collen Blijenberg
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2008-01-10 09:09:21 UTC (rev 92)
+++ trunk/Makefile.in 2008-06-12 13:15:00 UTC (rev 93)
@@ -11,7 +11,7 @@
PGSQL_LIBS = @PGSQL_LIBS@
SOURCEDIR = @SOURCEDIR@
LIBDIR = @LIBDIR@
-CFLAGS = -Wall @CFLAGS@ -I$(SOURCEDIR) -I$(SOURCEDIR)/include -I$(SOURCEDIR)/ubiqx -I$(SOURCEDIR)/popt
+CFLAGS = -Wall @CFLAGS@ -I$(SOURCEDIR) -I$(SOURCEDIR)/include -I$(SOURCEDIR)/ubiqx -I$(SOURCEDIR)/popt -I$(SOURCEDIR)/lib/replace -I$(SOURCEDIR)/tdb/include -I$(SOURCEDIR)/librpc
all: $(addsuffix .$(SHLIBEXT), $(modules))
Modified: trunk/pdb_mysql.c
===================================================================
--- trunk/pdb_mysql.c 2008-01-10 09:09:21 UTC (rev 92)
+++ trunk/pdb_mysql.c 2008-06-12 13:15:00 UTC (rev 93)
@@ -118,7 +118,7 @@
pdb_set_profile_path(u, row[13], PDB_SET);
pdb_set_acct_desc(u, row[14], PDB_SET);
pdb_set_workstations(u, row[15], PDB_SET);
- pdb_set_unknown_str(u, row[16], PDB_SET);
+ pdb_set_comment(u, row[16], PDB_SET);
pdb_set_munged_dial(u, row[17], PDB_SET);
if(!row[18] || !string_to_sid(&sid, row[18])) {
@@ -558,9 +558,22 @@
(*pdb_method)->add_sam_account = mysqlsam_add_sam_account;
(*pdb_method)->update_sam_account = mysqlsam_update_sam_account;
(*pdb_method)->delete_sam_account = mysqlsam_delete_sam_account;
- (*pdb_method)->rid_algorithm = mysqlsam_rid_algorithm;
+
+/* (*pdb_method)->rename_sam_account = mysqlsam_rename_sam_account; */
+/* (*pdb_method)->getgrsid = mysqlsam_getgrsid; */
+/* (*pdb_method)->getgrgid = mysqlsam_getgrgid; */
+/* (*pdb_method)->getgrnam = mysqlsam_getgrnam; */
+/* (*pdb_method)->add_group_mapping_entry = mysqlsam_add_group_mapping_entry; */
+/* (*pdb_method)->update_group_mapping_entry = mysqlsam_update_group_mapping_entry; */
+/* (*pdb_method)->delete_group_mapping_entry = mysqlsam_delete_group_mapping_entry; */
+/* (*pdb_method)->enum_group_mapping = mysqlsam_enum_group_mapping; */
+/* (*pdb_method)->get_account_policy = mysqlsam_get_account_policy; */
+/* (*pdb_method)->set_account_policy = mysqlsam_set_account_policy; */
+/* (*pdb_method)->get_seq_num = mysqlsam_get_seq_num; */
+
+ (*pdb_method)->rid_algorithm = mysqlsam_rid_algorithm;
(*pdb_method)->new_rid = mysqlsam_new_rid;
-
+
data = talloc(*pdb_method, struct pdb_mysql_data);
(*pdb_method)->private_data = data;
data->handle = NULL;
Modified: trunk/pdb_pgsql.c
===================================================================
--- trunk/pdb_pgsql.c 2008-01-10 09:09:21 UTC (rev 92)
+++ trunk/pdb_pgsql.c 2008-06-12 13:15:00 UTC (rev 93)
@@ -44,6 +44,11 @@
#define CONFIG_PORT_DEFAULT DEF_PGPORT_STR
#define CONFIG_DB_DEFAULT "samba"
+static int pgsqlsam_debug_level = DBGC_ALL;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS pgsqlsam_debug_level
+
/* handles for doing db transactions */
typedef struct pdb_pgsql_data {
PGconn *master_handle;
@@ -164,7 +169,7 @@
pdb_set_profile_path (u, PQgetvalue(r, row, 13), PDB_SET);
pdb_set_acct_desc (u, PQgetvalue(r, row, 14), PDB_SET);
pdb_set_workstations (u, PQgetvalue(r, row, 15), PDB_SET);
- pdb_set_unknown_str (u, PQgetvalue(r, row, 16), PDB_SET);
+ pdb_set_comment (u, PQgetvalue(r, row, 16), PDB_SET);
pdb_set_munged_dial (u, PQgetvalue(r, row, 17), PDB_SET);
pdb_set_acct_ctrl (u, PQgetlong (r, row, 23), PDB_SET);
@@ -550,13 +555,22 @@
static NTSTATUS pgsqlsam_init (struct pdb_methods **pdb_method, const char *location)
{
- NTSTATUS nt_status;
- struct pdb_pgsql_data *data = malloc_p(struct pdb_pgsql_data);
-
- if (!NT_STATUS_IS_OK(nt_status = make_pdb_method(pdb_method))) {
+ NTSTATUS nt_status
+
+ struct pdb_pgsql_data *data;
+
+ pgsqlsam_debug_level = debug_add_class("pgsqlsam");
+ if (pgsqlsam_debug_level == -1) {
+ pgsqlsam_debug_level = DBGC_ALL;
+ DEBUG(0,
+ ("pgsqlsam: Couldn't register custom debugging class!\n"));
+ }
+
+ if ( !NT_STATUS_IS_OK(nt_status = make_pdb_method( pdb_method )) ) {
return nt_status;
}
+
(*pdb_method)->name = "pgsqlsam";
(*pdb_method)->setsampwent = pgsqlsam_setsampwent;
@@ -569,8 +583,19 @@
(*pdb_method)->delete_sam_account = pgsqlsam_delete_sam_account;
(*pdb_method)->rid_algorithm = pgsqlsam_rid_algorithm;
(*pdb_method)->new_rid = pgsqlsam_new_rid;
-
-
+
+/* (*pdb_method)->rename_sam_account = pgsqlsam_rename_sam_account; */
+/* (*pdb_method)->getgrsid = pgsqlsam_getgrsid; */
+/* (*pdb_method)->getgrgid = pgsqlsam_getgrgid; */
+/* (*pdb_method)->getgrnam = pgsqlsam_getgrnam; */
+/* (*pdb_method)->add_group_mapping_entry = pgsqlsam_add_group_mapping_entry; */
+/* (*pdb_method)->update_group_mapping_entry = pgsqlsam_update_group_mapping_entry; */
+/* (*pdb_method)->delete_group_mapping_entry = pgsqlsam_delete_group_mapping_entry; */
+/* (*pdb_method)->enum_group_mapping = pgsqlsam_enum_group_mapping; */
+/* (*pdb_method)->get_account_policy = pgsqlsam_get_account_policy; */
+/* (*pdb_method)->set_account_policy = pgsqlsam_set_account_policy; */
+/* (*pdb_method)->get_seq_num = pgsqlsam_get_seq_num; */
+
(*pdb_method)->private_data = data;
data->master_handle = NULL;
Modified: trunk/pdb_sql.c
===================================================================
--- trunk/pdb_sql.c 2008-01-10 09:09:21 UTC (rev 92)
+++ trunk/pdb_sql.c 2008-06-12 13:15:00 UTC (rev 93)
@@ -1,6 +1,7 @@
/*
* Common PDB SQL backend functions
* Copyright (C) Jelmer Vernooij 2003-2004
+ * Copyright (C) Collen Blijenberg 2007-2008
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -503,13 +504,13 @@
pdb_get_workstations(newpwd));
}
- if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_UNKNOWNSTR)) {
+ if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_COMMENT)) {
some_field_affected = 1;
pdb_sql_string_field(query,
config_value_write(location,
"unknown string column",
CONFIG_UNKNOWN_STR_DEFAULT),
- pdb_get_workstations(newpwd));
+ pdb_get_comment(newpwd));
}
if (!isupdate || IS_SAM_CHANGED(newpwd, PDB_LMPASSWD)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|