RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm lua                          Date:   17-Aug-2008 20:56:13
  Branch: rpm-5_1                          Handle: 2008081718561201

  Modified files:           (Branch: rpm-5_1)
    lua/local               lwrs.c
    lua/shadow              groupadd.c useradd.c
    rpm                     CHANGES

  Log:
    - WR: don't spew error messages with internal lua shadow module.

  Summary:
    Revision    Changes     Path
    1.1.2.3     +2  -4      lua/local/lwrs.c
    1.1.2.3     +3  -1      lua/shadow/groupadd.c
    1.1.2.3     +3  -1      lua/shadow/useradd.c
    1.2288.2.85 +1  -0      rpm/CHANGES
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: lua/local/lwrs.c
  ============================================================================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 lwrs.c
  --- lua/local/lwrs.c	17 Aug 2008 18:49:38 -0000	1.1.2.2
  +++ lua/local/lwrs.c	17 Aug 2008 18:56:12 -0000	1.1.2.3
  @@ -1,5 +1,5 @@
   /*
  -** $Id: lwrs.c,v 1.1.2.2 2008/08/17 18:49:38 jbj Exp $
  +** $Id: lwrs.c,v 1.1.2.3 2008/08/17 18:56:12 jbj Exp $
   ** WRLinux utilities
   */
   
  @@ -25,8 +25,6 @@
    char *start = NULL;
    char c;
   
  - printf("Creating argv from [%s]\n", in);
  -
    for ( i=0; i < max; ++i)
     {
      while (*in == ' ')  ++in;        /* skip spaces */
  @@ -46,7 +44,7 @@
   	/*@globals internalState @*/
   	/*@modifies L, internalState @*/
   {
  -  printf("version 7\n");
  +  printf("version 8\n");
     return 0;
   }
   
  @@ .
  patch -p0 <<'@@ .'
  Index: lua/shadow/groupadd.c
  ============================================================================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 groupadd.c
  --- lua/shadow/groupadd.c	17 Aug 2008 18:49:38 -0000	1.1.2.2
  +++ lua/shadow/groupadd.c	17 Aug 2008 18:56:13 -0000	1.1.2.3
  @@ -35,7 +35,7 @@
   
   #include "config.h"
   
  -#ident "$Id: groupadd.c,v 1.1.2.2 2008/08/17 18:49:38 jbj Exp $"
  +#ident "$Id: groupadd.c,v 1.1.2.3 2008/08/17 18:56:13 jbj Exp $"
   
   #include <ctype.h>
   #include <fcntl.h>
  @@ -601,7 +601,9 @@
   		if (fflg) {
   			return (E_SUCCESS);
   		}
  +#if 0 /* wrs - suppress this warning */
   		fprintf (stderr, _("%s: group %s exists\n"), Prog, group_name);
  +#endif
   #ifdef WITH_AUDIT
   		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
   			      group_name, -1, 0);
  @@ .
  patch -p0 <<'@@ .'
  Index: lua/shadow/useradd.c
  ============================================================================
  $ cvs diff -u -r1.1.2.2 -r1.1.2.3 useradd.c
  --- lua/shadow/useradd.c	17 Aug 2008 18:49:38 -0000	1.1.2.2
  +++ lua/shadow/useradd.c	17 Aug 2008 18:56:13 -0000	1.1.2.3
  @@ -35,7 +35,7 @@
   
   #include "config.h"
   
  -#ident "$Id: useradd.c,v 1.1.2.2 2008/08/17 18:49:38 jbj Exp $"
  +#ident "$Id: useradd.c,v 1.1.2.3 2008/08/17 18:56:13 jbj Exp $"
   
   #include <ctype.h>
   #include <errno.h>
  @@ -1902,7 +1902,9 @@
   	 * Start with a quick check to see if the user exists.
   	 */
   	if (getpwnam (user_name)) {
  +#if 0 /* wrs - suppress this warning */
   		fprintf (stderr, _("%s: user %s exists\n"), Prog, user_name);
  +#endif
   #ifdef WITH_AUDIT
   		audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding user",
   			      user_name, -1, 0);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.84 -r1.2288.2.85 CHANGES
  --- rpm/CHANGES	17 Aug 2008 18:49:36 -0000	1.2288.2.84
  +++ rpm/CHANGES	17 Aug 2008 18:56:12 -0000	1.2288.2.85
  @@ -1,4 +1,5 @@
   5.1.4 -> 5.1.5:
  +    - jbj: WR: don't spew error messages with internal lua shadow module.
       - jbj: WR: add shadow/chkconfig internal lua modules.
       - jbj: WR: Color/arch affinity while upgrading on multilib platforms.
       - jbj: WR: Permit configurable arch strings.
  @@ .