← Back to branch summary

~ubuntu-branches/ubuntu/precise/xdm/precise

« back to all changes in this revision

Viewing changes to streams.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-30 00:53:09 UTC
  • mfrom: (9.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110130005309-30mjjyk7div7d494
Tags: 1:1.1.10-3ubuntu1
https://launchpad.net/bugs/682196
http://bugs.debian.org/556694
* Merge from debian unstable.  Remaining changes: (LP: #682196)
  - debian/{rules, xdm.install, local/ubuntu*}:
    + Add Ubuntu graphics and configure xdm to use them by default.
  - debian/patches/ubuntu_no_whiteglass.diff: Don't hardcode
    the default Xcursor theme to whiteglass. Use the Ubuntu
    default x-cursor-theme instead.
* debian/patches/ftbfs_binutils-gold.diff: Fix FTBFS with binutils-gold
  and ld --as-needed. (Closes: #556694)
* Dropped changes, no longer applicable:
  - debian/{xdm.postinst.in, xdm.postrm.in, xdm.preinst.in}

Show diffs side-by-side

added added

removed removed

Lines of Context:
streams.c
1
 
/* $Xorg: streams.c,v 1.4 2001/02/09 02:05:40 xorgcvs Exp $ */
2
1
/*
3
2
 
4
3
Copyright 1988, 1998  The Open Group
26
25
from The Open Group.
27
26
 
28
27
*/
29
 
/* $XFree86: xc/programs/xdm/streams.c,v 3.7 2003/07/09 15:27:39 tsi Exp $ */
30
28
 
31
29
/*
32
30
 * xdm - display manager daemon
39
37
#include "dm_error.h"
40
38
 
41
39
#ifdef XDMCP
42
 
#ifdef STREAMSCONN
 
40
# ifdef STREAMSCONN
43
41
 
44
 
#include <fcntl.h>
45
 
#include <tiuser.h>
46
 
#include <netconfig.h>
47
 
#include <netdir.h>
 
42
#  include <fcntl.h>
 
43
#  include <tiuser.h>
 
44
#  include <netconfig.h>
 
45
#  include <netdir.h>
48
46
 
49
47
extern int      xdmcpFd;
50
48
extern int      chooserFd;
84
82
    RegisterCloseOnFork (xdmcpFd);
85
83
 
86
84
    service.h_host = HOST_SELF;
87
 
    sprintf(bindbuf, "%d", request_port);
 
85
    snprintf(bindbuf, sizeof(bindbuf), "%d", request_port);
88
86
    service.h_serv = bindbuf;
89
87
    netdir_getbyname(nconf, &service, &servaddrs);
90
88
    freenetconfigent(nconf);
165
163
    return;
166
164
}
167
165
 
168
 
#endif /* STREAMSCONN */
 
166
# endif /* STREAMSCONN */
169
167
#endif /* XDMCP */