Hello community, here is the log from the commit of package pam_cifs checked in at Mon Oct 30 00:14:28 CET 2006. -------- --- pam_cifs/pam_cifs.changes 2006-08-02 15:54:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/pam_cifs/pam_cifs.changes 2006-10-29 11:39:08.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Oct 29 11:39:00 CET 2006 - meissner@suse.de + +- use RPM_OPT_FLAGS +- fixed bad uses of strncat(). + +------------------------------------------------------------------- New: ---- pam_cifs-0.43-cflags.patch pam_cifs-strncat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_cifs.spec ++++++ --- /var/tmp/diff_new_pack.oTVdKU/_old 2006-10-30 00:14:24.000000000 +0100 +++ /var/tmp/diff_new_pack.oTVdKU/_new 2006-10-30 00:14:24.000000000 +0100 @@ -12,14 +12,16 @@ Name: pam_cifs BuildRequires: pam-devel -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/Security Autoreqprov: on Version: 0.43 -Release: 1 +Release: 14 Summary: PAM module for mount/umount CIFS shares URL: http://sourceforge.net/projects/pam-cifs Source: pam_cifs-%{version}.tar.bz2 +Patch0: pam_cifs-0.43-cflags.patch +Patch1: pam_cifs-strncat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: pam @@ -37,9 +39,11 @@ %prep %setup -q -n pam-cifs +%patch0 +%patch1 %build -make +make OPTFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -58,6 +62,9 @@ %attr(555,root,root)/%{_sbindir}/cifsumountd %changelog -n pam_cifs +* Sun Oct 29 2006 - meissner@suse.de +- use RPM_OPT_FLAGS +- fixed bad uses of strncat(). * Wed Aug 02 2006 - mc@suse.de - update to version 0.43 - Added options "windomain=<domain>" and "mount_home" ++++++ pam_cifs-0.43-cflags.patch ++++++ --- Makefile +++ Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pam-cifs/pam-cifs/Makefile,v 1.7 2006/08/01 14:13:03 bjornts Exp $ +# $Header: /abuild/meissner/pam_cifs/BUILD/pam-cifs/Makefile,v 1.1 2006/10/29 10:32:19 meissner Exp meissner $ # # pam_cifs - Linux-PAM module for mount/umount CIFS shares # @@ -20,7 +20,8 @@ # CC=gcc -CFLAGS += -g -Wall -pedantic -std=c99 -fPIC +OPTFLAGS = -O2 +CFLAGS += $(OPTFLAGS) -g -Wall -pedantic -std=c99 -fPIC CFLAGS += -DDEFAULT_PATH_PREFIX='"/Home"' CFLAGS += -DDEFAULT_PATH_SUFFIX='""' ++++++ pam_cifs-strncat.patch ++++++ --- mkdirpath.c +++ mkdirpath.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pam-cifs/pam-cifs/mkdirpath.c,v 1.1 2005/08/29 11:39:25 wimalopaan Exp $ + * $Header: /abuild/meissner/pam_cifs/BUILD/pam-cifs/mkdirpath.c,v 1.1 2006/10/29 10:34:14 meissner Exp meissner $ * * pam_cifs - Linux-PAM module for mount/umount CIFS shares * Copyright (C) 2005 Wilhelm Meier (meier@informatik.fh-kl.de) @@ -57,8 +57,8 @@ while((component = strtok_r(npath, "/", &npath2)) != NULL) { npath = NULL; - strncat(newdir, "/", PATH_MAX); - strncat(newdir, component, PATH_MAX); + strncat(newdir, "/", sizeof(newdir)-strlen(newdir)-1); + strncat(newdir, component, sizeof(newdir)-strlen(newdir)-1); if (stat(newdir, &statbuf) < 0) { if (errno == ENOENT) { --- pam_sm_open_session.c +++ pam_sm_open_session.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pam-cifs/pam-cifs/pam_sm_open_session.c,v 1.6 2006/08/01 14:13:03 bjornts Exp $ + * $Header: /abuild/meissner/pam_cifs/BUILD/pam-cifs/pam_sm_open_session.c,v 1.1 2006/10/29 10:34:14 meissner Exp meissner $ * * pam_cifs - Linux-PAM module for mount/umount CIFS shares * Copyright (C) 2005 Wilhelm Meier (meier@informatik.fh-kl.de) @@ -114,13 +114,13 @@ char target[PATH_MAX]; if (pam_cifs_options.mount_home > 0) { - strncpy(target, pwd->pw_dir, PATH_MAX); + strncpy(target, pwd->pw_dir, sizeof(target)); } else { - strncpy(target, pam_cifs_options.pathprefix, PATH_MAX); - strncat(target, "/", PATH_MAX); - strncat(target, user, PATH_MAX); - strncat(target, pam_cifs_options.pathsuffix, PATH_MAX); + strncpy(target, pam_cifs_options.pathprefix, sizeof(target)); + strncat(target, "/", sizeof(target)-strlen(target)-1); + strncat(target, user, sizeof(target)-strlen(target)-1); + strncat(target, pam_cifs_options.pathsuffix, sizeof(target)-strlen(target)-1); } struct stat statbuf; @@ -129,8 +129,8 @@ if (pam_cifs_options.make_mount_point > 0) { slog("should create mount point %s", target); char newpath[PATH_MAX]; - strncpy(newpath, user, PATH_MAX); - strncat(newpath, pam_cifs_options.pathsuffix, PATH_MAX); + strncpy(newpath, user, sizeof(newpath)); + strncat(newpath, pam_cifs_options.pathsuffix, sizeof(newpath)-strlen(newpath)-1); if (mkdirpath(pam_cifs_options.pathprefix, newpath, S_IRWXU, pwd->pw_uid, pwd->pw_gid) < 0) { slog("can't make %s in %s\n", newpath, pam_cifs_options.pathprefix); return cleanup(PAM_SESSION_ERR); @@ -149,10 +149,10 @@ } char source[PATH_MAX]; - strncpy(source, pam_cifs_options.sourceprefix, PATH_MAX); - strncat(source, "/", PATH_MAX); - strncat(source, user, PATH_MAX); - strncat(source, pam_cifs_options.sourcesuffix, PATH_MAX); + strncpy(source, pam_cifs_options.sourceprefix, sizeof(source)); + strncat(source, "/", sizeof(source)-strlen(source)-1); + strncat(source, user, sizeof(source)-strlen(source)-1); + strncat(source, pam_cifs_options.sourcesuffix, sizeof(source)-strlen(source)-1); if (do_mount(source, target, pam_cifs_options.options, authtok, pwd->pw_uid, pwd->pw_gid, user, pam_cifs_options.background) < 0) { @@ -161,9 +161,9 @@ if (strncmp(pam_cifs_options.linkname, "", PATH_MAX) != 0) { char linkpath[PATH_MAX]; - strncpy(linkpath, pwd->pw_dir, PATH_MAX); - strncat(linkpath, "/", PATH_MAX); - strncat(linkpath, pam_cifs_options.linkname, PATH_MAX); + strncpy(linkpath, pwd->pw_dir, sizeof(linkpath)); + strncat(linkpath, "/", sizeof(linkpath)-strlen(linkpath)-1); + strncat(linkpath, pam_cifs_options.linkname, sizeof(linkpath)-strlen(linkpath)-1); slog("should create link %s to %s\n", linkpath, target); if (symlink(target, linkpath) < 0) { slog("symlink: %s\n", strerror(errno)); --- parse_options.c +++ parse_options.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pam-cifs/pam-cifs/parse_options.c,v 1.5 2006/08/01 14:13:03 bjornts Exp $ + * $Header: /abuild/meissner/pam_cifs/BUILD/pam-cifs/parse_options.c,v 1.1 2006/10/29 10:37:03 meissner Exp meissner $ * * pam_cifs - Linux-PAM module for mount/umount CIFS shares * Copyright (C) 2005 Wilhelm Meier (meier@informatik.fh-kl.de) @@ -99,15 +99,15 @@ if (strcmp(param, "windomain") == 0) { if (value != NULL) { strncpy(pam_cifs_options.options, "domain=", NAME_MAX); - strncat(pam_cifs_options.options, value, NAME_MAX); - strncat(pam_cifs_options.options, ",", NAME_MAX); + strncat(pam_cifs_options.options, value, sizeof(pam_cifs_options.options)-strlen(pam_cifs_options.options)-1); + strncat(pam_cifs_options.options, ",", sizeof(pam_cifs_options.options)-strlen(pam_cifs_options.options)-1); } } if (strcmp(param, "options") == 0) { if (value != NULL) { if (pam_cifs_options.options != NULL) { - strncat(pam_cifs_options.options, value, NAME_MAX); + strncat(pam_cifs_options.options, value, sizeof(pam_cifs_options.options)-strlen(pam_cifs_options.options)-1); } else { strncpy(pam_cifs_options.options, value, NAME_MAX); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org