SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge latest (4.3.99.16) from XFree86 (vendor) branch

Browse Source
This commit is contained in:
Kaleb Keithley
2003-11-26 22:49:07 +00:00
parent c57959ad6a
commit 0097b6fe2d
796 changed files with 58012 additions and 26524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Xprint/attributes.c
View File

@@ -44,7 +44,7 @@ copyright holders.
** *********************************************************
**
********************************************************************/
/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.18 2002/05/31 18:45:53 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */
#include <X11/Xproto.h>
#include <string.h>
@@ -61,6 +61,9 @@ copyright holders.
#include <X11/extensions/Printstr.h>
#include "attributes.h"
#include "Xlib.h"
#include "Xresource.h"
#include "Xrm.c"
static XrmDatabase CopyDb(XrmDatabase inDb);
@@ -1116,9 +1119,7 @@ SendFileToCommand(
*/
if(userName)
{
uid_t myUid;
if((myUid = geteuid()) == (uid_t)0)
if(geteuid() == (uid_t)0)
{
struct passwd *pPasswd;
@@ -1366,12 +1367,11 @@ VectorizeCommand(
XpContextPtr pContext)
{
char *cmdName;
int numChars;
if(command == (char *)NULL)
return (char *)NULL;
numChars = GetToken(command, &cmdName);
(void) GetToken(command, &cmdName);
if(cmdName == (char *)NULL)
return (char *)NULL;