Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.465
diff -u -2 -0 -r1.465 ChangeLog
--- xc/ChangeLog	15 Oct 2004 22:08:38 -0000	1.465
+++ xc/ChangeLog	15 Oct 2004 22:26:14 -0000
@@ -1,21 +1,26 @@
 2004-10-15 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/Xprint/attributes.c
+        Bugzilla #1647: Fix the problem that |XpSubmitJob()| returns
+        a random value (patch by Stefan Dirsch/SuSE).
+
+2004-10-15 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/Xserver/Xprint/ps/PsColor.c
         Bugzilla #1646: Fix the problem that |PsCreateColormap()| returns
         a random value (patch by Stefan Dirsch/SuSE).
 
 2004-10-15 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/Xserver/Xprint/Oid.c
         Bugzilla #1637: Fix problems in oid code which may cause the
         usage of an invalid string pointer (original patch by Egbert Eich).
 
 Thu Oct 14 20:43:03 2004  Søren Sandmann  <sandmann@redhat.com>
 
 	* programs/xmodmap/pf.c (process_line): Fix a
 	write-to-constant-string issue.
 	* programs/xmodmap/xmodmap.c (main): Fix several buffer overruns.
 
 2004-10-14  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S:
 	Bug #1628: Convert xf86{BusToMem,MemToBus} to PIC code, eliminating
 	a text relocation and enabling the server to be built as a
Index: xc/programs/Xserver/Xprint/attributes.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/attributes.c,v
retrieving revision 1.5
diff -u -2 -0 -r1.5 attributes.c
--- xc/programs/Xserver/Xprint/attributes.c	19 Jul 2004 22:01:52 -0000	1.5
+++ xc/programs/Xserver/Xprint/attributes.c	15 Oct 2004 22:26:34 -0000
@@ -1498,40 +1498,42 @@
     {
         vector[i] = ReplaceAllKeywords(pContext, vector[i]);
 	if(vector[i] == (char *)NULL)
 	{
 	    xfree(cmdNam);
 	    for(i = 0; vector[i] != (char *)NULL; i++)
 		xfree(vector[i]);
 	    xfree(vector);
 	    return BadAlloc;
 	}
     }
 
     userName = XpGetOneAttribute(pContext, XPJobAttr, "job-owner");
     if(userName != (char *)NULL && strlen(userName) == 0)
 	userName = (char *)NULL;
 
     SendFileToCommand(fileName, cmdNam, vector, userName);
 
     FreeVector(vector);
     xfree(cmdNam);
+    
+    return Success;
 }
 
 /*
  * SearchInputTrays()
  *
  * Given a tray, return the medium in the tray.  Conversely, given a
  * medium, return a tray in which it can be found.  In either case,
  * return NULL if the given tray or medium cannot be found.
  */
 #define TRAY 0
 #define MEDIUM 1
 
 static char *
 SearchInputTrays(XpContextPtr pCon,
 		 int which,
 		 char *val)
 {
     char *inputTraysMedium, tray[80], medium[80], *copy;
     char *pS, *pE, *pLast;