Skip to content

N
nx-libs
Unverified Commit 2f19f2f6 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'sunweaver-pr/libXau-cleanup' into 3.6.x

Attributes GH PR #152: https://github.com/ArcticaProject/nx-libs/pull/152 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 14:55:00 +0200
parents a3a29528 20454528
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 2267 deletions
Makefile
View file @ 2f19f2f6
......@@ -103,7 +103,7 @@ install-lite:
gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
install-full:
for f in nxagent nxauth; do \
for f in nxagent; do \
$(INSTALL_PROGRAM) bin/$$f $(DESTDIR)$(BINDIR); done
for d in nxcompext nxcompshad; do \
$(MAKE) -C $$d install; done
......@@ -115,13 +115,10 @@ install-full:
$(INSTALL_FILE) nx-X11/programs/Xserver/Xext/SecurityPolicy $(DESTDIR)$(PREFIX)/share/nx
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_PROGRAM) nx-X11/programs/nxauth/nxauth $(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_PROGRAM) nx-X11/programs/Xserver/nxagent $(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1/
$(INSTALL_FILE) nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 $(DESTDIR)$(PREFIX)/share/man/man1/
$(INSTALL_FILE) nx-X11/programs/nxauth/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/
mv -f $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.man $(DESTDIR)$(PREFIX)/share/man/man1/nxauth.1
gzip $(DESTDIR)$(PREFIX)/share/man/man1/*.1
# create a clean nx-X11/.build-exports space
......@@ -180,7 +177,7 @@ uninstall-lite:
$(RM_DIR) $(DESTDIR)$(NXLIBDIR)/share/nx/
uninstall-full:
for f in nxagent nxauth; do \
for f in nxagent; do \
$(RM_FILE) $(DESTDIR)$(BINDIR)/$$f; done
$(RM_FILE) $(DESTDIR)$(PREFIX)/share/nx/VERSION.nxagent
......
debian/README.source
View file @ 2f19f2f6
......@@ -10,7 +10,7 @@ This package originally pulled in 7 source tarballs from NoMachine:
nx-X11
nxagent
nxauth
nxauth (discontinued in nx-libs)
nxcomp
nxcompshad
nxcompext
......
debian/control
View file @ 2f19f2f6
......@@ -75,6 +75,7 @@ Depends:
nx-x11-common (>= ${source:Version}), nx-x11-common (<< ${source:Version}.1),
Breaks: nxlibs (<= 3.5.1),
libnx-x11 (<< 2:3.5.0.29-1~),
libnx-xau6 (<< 2:3.6.0.0),
libnx-xcomposite1 (<< 2:3.6.0.0),
libnx-xdamage1 (<< 2:3.6.0.0),
libnx-xdmcp6 (<< 2:3.6.0.0),
......@@ -85,6 +86,7 @@ Breaks: nxlibs (<= 3.5.1),
libnx-xrender1 (<< 2:3.6.0.0),
libnx-xtst6 (<< 2:3.6.0.0),
Replaces: nxlibs,
libnx-xau6,
libnx-xcomposite1,
libnx-xdamage1,
libnx-xdmcp6,
......@@ -107,6 +109,7 @@ Provides: libnx-x11-6-dev
Section: libdevel
Architecture: any
Breaks: nxlibs-dev (<=3.5.1),
libnx-xau-dev (<< 2:3.6.0.0),
libnx-xcomposite-dev (<< 2:3.6.0.0),
libnx-xdamage-dev (<< 2:3.6.0.0),
libnx-xdmcp-dev (<< 2:3.6.0.0),
......@@ -117,6 +120,7 @@ Breaks: nxlibs-dev (<=3.5.1),
libnx-xrender-dev (<< 2:3.6.0.0),
libnx-xtst-dev (<< 2:3.6.0.0),
Replaces: nxlibs-dev,
libnx-xau-dev,
libnx-xcomposite-dev,
libnx-xdamage-dev,
libnx-xdmcp-dev,
......@@ -145,6 +149,7 @@ Depends:
${misc:Depends},
Section: debug
Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
libnx-xau6-dbg (<< 2:3.6.0.0),
libnx-xcomposite1-dbg (<< 2:3.6.0.0),
libnx-xdamage1-dbg (<< 2:3.6.0.0),
libnx-xdmcp6-dbg (<< 2:3.6.0.0),
......@@ -155,6 +160,7 @@ Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
libnx-xrender1-dbg (<< 2:3.6.0.0),
libnx-xtst6-dbg (<< 2:3.6.0.0),
Replaces: nx-x11-dbg,
libnx-xau6-dbg,
libnx-xcomposite1-dbg,
libnx-xdamage1-dbg,
libnx-xdmcp6-dbg,
......@@ -172,63 +178,6 @@ Description: nx-X11 client-side library (debug package)
This package contains debug symbols for the core nx-X11 libraries
customized for nxagent.
Package: libnx-xau6
Architecture: any
Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11 (<< 2:3.5.0.29-1~),
Description: nx-X11 authorisation library
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
This package provides the main interface to the nx-X11 authorisation handling,
which controls authorisation for X connections, both client-side and
server-side.
Package: libnx-xau-dev
Provides: libnx-xau6-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
libnx-xau6 (= ${binary:Version}),
${misc:Depends},
Breaks: nxlibs (<= 3.5.1),
libnx-x11-dev (<< 2:3.5.0.29-1~),
Description: nx-X11 authorisation library (development headers)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
This package provides the main interface to the nx-X11 authorisation handling,
which controls authorisation for X connections, both client-side and
server-side.
.
This package contains the development headers for this library.
Package: libnx-xau6-dbg
Architecture: any
Multi-Arch: same
Depends:
libnx-xau6 (= ${binary:Version}),
${misc:Depends},
Section: debug
Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
Description: nx-X11 authorisation library (debug package)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
This package provides the main interface to the nx-X11 authorisation handling,
which controls authorisation for X connections, both client-side and
server-side.
.
This package contains debug symbols for this library.
Package: nx-x11proto-composite-dev
Section: libdevel
Architecture: any
......@@ -430,6 +379,10 @@ Depends:
Recommends:
xfonts-base,
xkb-data,
Breaks:
nxauth,
Replaces:
nxauth,
Description: NX agent
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
......@@ -473,12 +426,16 @@ Description: NX agent (debug package)
Package: nxproxy
Architecture: any
Breaks: qvd-nxproxy
Replaces: qvd-nxproxy
Multi-Arch: foreign
Depends:
${shlibs:Depends},
${misc:Depends},
Breaks:
qvd-nxproxy,
nxauth,
Replaces:
qvd-nxproxy,
nxauth,
Description: NX proxy
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
......@@ -507,38 +464,6 @@ Description: NX proxy (debug package)
helpful backtraces. You can safely remove it if you do not intend to
debug NX packages on this system.
Package: nxauth
Architecture: any
Multi-Arch: foreign
Depends:
${shlibs:Depends},
${misc:Depends},
Description: NX xauth
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
This package provides the NX xauth binary.
Package: nxauth-dbg
Section: debug
Architecture: any
Multi-Arch: foreign
Depends:
nxauth (= ${binary:Version}),
${misc:Depends},
Breaks: nx-x11-dbg (<< 2:3.5.0.29-1~),
Description: NX auth (debug package)
NX is a software suite which implements very efficient
compression of the X11 protocol. This increases performance when
using X applications over a network, especially a slow one.
.
This package provides the NX auth binary.
.
This package contains detached debug symbols that help generating more
helpful backtraces. You can safely remove it if you do not intend to
debug NX packages on this system.
Package: libxcomp3
Architecture: any
Multi-Arch: same
......
debian/libnx-x11-dev.install
View file @ 2f19f2f6
usr/lib/*/libNX_X11.so
usr/include/*/nx-X11/ImUtil.h
usr/include/*/nx-X11/Xauth.h
usr/include/*/nx-X11/XKBlib.h
usr/include/*/nx-X11/Xcms.h
usr/include/*/nx-X11/Xlib.h
......
debian/libnx-xau-dev.install deleted 100644 → 0
View file @ a3a29528
usr/lib/*/libNX_Xau.so
usr/include/*/nx-X11/Xauth.h
debian/libnx-xau6.install deleted 100644 → 0
View file @ a3a29528
usr/lib/*/libNX_Xau.so.*
debian/libnx-xau6.symbols deleted 100644 → 0
View file @ a3a29528
libNX_Xau.so.6 libnx-xau6 #MINVER#
XauDisposeAuth@Base 3.5.0.29
XauFileName@Base 3.5.0.29
XauGetAuthByAddr@Base 3.5.0.29
XauGetBestAuthByAddr@Base 3.5.0.29
XauLockAuth@Base 3.5.0.29
XauReadAuth@Base 3.5.0.29
XauUnlockAuth@Base 3.5.0.29
XauWriteAuth@Base 3.5.0.29
debian/nxauth.dirs deleted 100644 → 0
View file @ a3a29528
usr/bin
usr/lib/nx/bin
debian/nxauth.install deleted 100644 → 0
View file @ a3a29528
usr/lib/nx/bin/nxauth
usr/bin/nxauth
usr/share/man/man1/nxauth.1*
debian/rules
View file @ 2f19f2f6
......@@ -56,12 +56,9 @@ override_dh_auto_build:
override_dh_strip:
dh_strip -plibnx-x11-6 --dbg-package=libnx-x11-6-dbg
dh_strip -plibnx-xau6 --dbg-package=libnx-xau6-dbg
dh_strip -plibnx-xext6 --dbg-package=libnx-xext6-dbg
dh_strip -plibxcomp3 --dbg-package=libxcomp3-dbg
dh_strip -plibxcompshad3 --dbg-package=libxcompshad3-dbg
dh_strip -plibxcompext3 --dbg-package=libxcompext3-dbg
dh_strip -pnxagent --dbg-package=nxagent-dbg
dh_strip -pnxproxy --dbg-package=nxproxy-dbg
dh_strip -pnxauth --dbg-package=nxauth-dbg
nx-X11/config/cf/Imake.tmpl
View file @ 2f19f2f6
......@@ -566,12 +566,6 @@ X_BYTE_ORDER = ByteOrder
#ifndef HasSecureRPC
#define HasSecureRPC NO /* if you have Secure RPC */
#endif
#ifndef HasKrbIV
#define HasKrbIV NO /* if you have Kerberos IV */
#endif
#ifndef HasKrb5
#define HasKrb5 NO /* if you have Kerberos V5 */
#endif
#ifndef HasLatex
#define HasLatex NO
#endif
......@@ -591,27 +585,6 @@ X_BYTE_ORDER = ByteOrder
#ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */
#define GzipLibrary -lz
#endif
#if HasKrbIV
#ifndef KrbIVIncludes
#define KrbIVIncludes /**/
#endif
#ifndef KrbIVLibraries
#define KrbIVLibraries -lkrb -ldes
#endif
#endif
#if HasKrb5
#ifndef Krb5Includes
#define Krb5Includes -I/krb5/include
#endif
#ifndef Krb5Libraries
#define Krb5Libraries -L/krb5/lib -L/usr/isode/lib -lkrb5 -lcrypto -lisode -lcom_err -ldbm
#endif
#else
#undef Krb5Includes
#define Krb5Includes /**/
#undef Krb5Libraries
#define Krb5Libraries /**/
#endif
#ifndef UseGnuMalloc
#define UseGnuMalloc NO
#endif
......@@ -1878,7 +1851,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
STD_DEFINES = StandardDefines $(PROJECT_DEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags
EXTRA_LDOPTIONS = ExtraLoadOptions
EXTRA_LIBRARIES = MallocLibraries ExtraLibraries Krb5Libraries
EXTRA_LIBRARIES = MallocLibraries ExtraLibraries
TAGS = TagsCmd
#if ConstructMFLAGS
MFLAGS = -$(MAKEFLAGS)
......
nx-X11/config/cf/README
View file @ 2f19f2f6
......@@ -68,8 +68,6 @@ Imake.tmpl provides defaults for the following variables:
HasGnuMake use the GNU make program?
HasGhostPCL boolean for system has GhostPCL
HasGhostScript boolean for system has GhostScript
HasKrbIV system has Kerberos version IV support?
HasKrb5 system has Kerberos version 5 support?
HasLargeTmp boolean for system has /tmp space
HasLatex system has LaTeX document preparation software
HasLibCrypt boolean for system has libcrypt
......@@ -105,10 +103,6 @@ Imake.tmpl provides defaults for the following variables:
InstPgmFlags install flags for normal programs
InstUidFlags install flags for xterm to chown /dev/ptys
InstallCmd command to install files
KrbIVIncludes where to include KerberosIV header files from
KrbIVLibraries where to load KerberosIV libraries from
Krb5Includes where to include Kerberos header files from
Krb5Libraries where to load Kerberos libraries from
LdCmd command to run loader
LdCombineFlags flags for incremental loading
LexCmd command to run lex
......@@ -189,7 +183,6 @@ X11.tmpl provides defaults for the following variables:
ConnectionFlags -D's for supported transports
ContribDir location of user-contributed sources
DebugLibX11 build libX11_d.a
DebugLibXau build libXau_d.a
DebugLibXext build libXext_d.a
DefaultCursorTheme name of default cursor theme
DefaultFontPath default server font path
......@@ -208,7 +201,6 @@ X11.tmpl provides defaults for the following variables:
needs Wraphelp.c, see Release Notes
InstallLibManPages boolean for installing library man pages
InstallSecurityConfig install server security policy file over old?
KrbIVDefines defines for use with KerberosIV
LibDir directory in which to install X11 support files
LibManSuffix man suffix for library pages
LibmanDir directory in which to install library man pages
......@@ -223,12 +215,10 @@ X11.tmpl provides defaults for the following variables:
NeedDefaultDepLibs boolean for enabling default DEPLIBS
NlsDir directory in which to install nls files
NormalLibX11 build libX11.a
NormalLibXau build libXau.a
NormalLibXext build libXext.a
OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName
PrimaryScreenResolution resolution of default server screen
ProfileLibX11 build libX11_p.a
ProfileLibXau build libXau_p.a
ProfileLibXext build libXext_p.a
ProjectX version indicating this is the X Window System
RemoveTargetProgramByMoving boolean for rm -f that doesn't
......@@ -239,7 +229,6 @@ X11.tmpl provides defaults for the following variables:
ServerOSDefines OS -D's for server
ServerAssertDefines -DNDEBUG for no assertions, /**/ for assertions
SharedLibX11 boolean for making sharable libX11.so
SharedLibXau boolean for making sharable libXau.so
SharedLibXext boolean for making sharable libXext.so
ShmDefines MIT-SHM define
TwmDir directory in which to install twm config files
......@@ -311,8 +300,6 @@ An <os>Lib.tmpl file provides defaults for the following variables:
SharedX11Reqs required libs for libX11.so
SharedX11Rev version number for libX11.so
SharedXauReqs required libs for libXau.so
SharedXauRev version number for libXau.so
SharedXextReqs required libs for libXext.so
SharedXextRev version number for libXext.so
......
nx-X11/config/cf/X11.tmpl
View file @ 2f19f2f6
......@@ -153,10 +153,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef BuildXextLib
#define BuildXextLib BuildLibraries
#endif
#ifndef BuildXauLib
#define BuildXauLib (BuildLibraries || BuildLibrariesForXServers)
#endif
#define UseInstalledXauLib (defined(UseInstalled) || !BuildXauLib)
#ifndef BuildTestExt
#define BuildTestExt YES
#endif
......@@ -743,20 +739,6 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef ServerOSDefines
#define ServerOSDefines /**/
#endif
#if HasKrbIV
#ifndef KrbIVDefines
#define KrbIVDefines -DKERBEROS
#endif
#else
#define KrbIVDefines /**/
#endif
#if HasKrb5
#ifndef Krb5Defines
#define Krb5Defines -DK5AUTH
#endif
#else
#define Krb5Defines /**/
#endif
#ifndef ServerExtraDefines
#define ServerExtraDefines /* -DPIXPRIV */
#endif
......@@ -1237,31 +1219,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION)
DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
XLIB = $(EXTENSIONLIB) $(XONLYLIB)
LINTXLIB = $(LINTXONLYLIB)
#ifndef SharedLibXau
#define SharedLibXau YES
#endif
#ifndef NormalLibXau
#define NormalLibXau (!SharedLibXau | ForceNormalLib)
#endif
#ifndef DebugLibXau
#define DebugLibXau NO /* debugged auth library */
#endif
#ifndef ProfileLibXau
#define ProfileLibXau NO /* profiled auth library */
#endif
XAUTHSRC = $(LIBSRC)/Xau
#if SharedLibXau
#ifndef SharedXauRev
#define SharedXauRev 6.0
#endif
SharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),SOXAUTHREV,SharedXauRev)
#else
#if !UseInstalledXauLib
ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),XBuildLibDir)
#else
ProjectUnsharedLibReferences(XAUTH,NX_Xau,$(XAUTHSRC),$(USRLIBDIR))
#endif
#endif
#if HasMotif
......
nx-X11/config/cf/host.def
View file @ 2f19f2f6
......@@ -411,8 +411,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define BuildXKB YES
#define BuildXKBlib YES
#define SharedLibXau YES
/*
* If you are running NetBSD 0.9C or later, and have the aperture driver
* installed, uncomment this.
......@@ -563,7 +561,5 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
#define X86EMU_LIBPATH /usr/local/lib
*/
#define SharedLibXau YES
#define BuildRman NO
#define BuildLoadableXlibI18n NO
nx-X11/config/cf/linux.cf
View file @ 2f19f2f6
......@@ -609,7 +609,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
# define AsCmd CcCmd -c -x assembler
# define LdCmd CcCmd -nostdlib
# define AsmDefines -D__ELF__
# define SharedLibXau YES
# endif /* HPArchitecture */
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
......
nx-X11/include/Imakefile
View file @ 2f19f2f6
......@@ -16,6 +16,8 @@ GLXDIR = GL
SUBDIRS = extensions $(GLXDIR)
AU_HEADERS = Xauth.h
#ifdef Win32Architecture
EXTRA_HEADERS = Xw32defs.h Xwinsock.h Xwindows.h
#elif defined(cygwinArchitecture)
......@@ -46,6 +48,7 @@ HEADERS = \
ap_keysym.h \
keysym.h \
keysymdef.h \
$(AU_HEADERS) \
$(EXTRA_HEADERS) \
$(NULL)
......
nx-X11/lib/Xau/Xauth.h → nx-X11/include/Xauth.h
View file @ 2f19f2f6
......@@ -53,7 +53,6 @@ typedef struct xauth {
# define FamilyLocal (256) /* not part of X standard (i.e. X.h) */
# define FamilyWild (65535)
# define FamilyNetname (254) /* not part of X standard */
# define FamilyKrb5Principal (253) /* Kerberos 5 principal name */
# define FamilyLocalHost (252) /* for local non-net authentication */
......@@ -65,22 +64,6 @@ Xauth *XauReadAuth(
FILE* /* auth_file */
);
int XauLockAuth(
_Xconst char* /* file_name */,
int /* retries */,
int /* timeout */,
long /* dead */
);
int XauUnlockAuth(
_Xconst char* /* file_name */
);
int XauWriteAuth(
FILE* /* auth_file */,
Xauth* /* auth */
);
Xauth *XauGetAuthByName(
_Xconst char* /* display_name */
);
......@@ -132,31 +115,8 @@ void XauDisposeAuth(
Xauth* /* auth */
);
#ifdef K5AUTH
#include <krb5/krb5.h>
/* 9/93: krb5.h leaks some symbols */
#undef BITS32
#undef xfree
int XauKrb5Encode(
krb5_principal /* princ */,
krb5_data * /* outbuf */
);
int XauKrb5Decode(
krb5_data /* inbuf */,
krb5_principal * /* princ */
);
#endif /* K5AUTH */
_XFUNCPROTOEND
/* Return values from XauLockAuth */
# define LOCK_SUCCESS 0 /* lock succeeded */
# define LOCK_ERROR 1 /* lock unexpectely failed, check errno */
# define LOCK_TIMEOUT 2 /* lock failed, timeouts expired */
#endif /* _XAUTH_STRUCT_ONLY */
#endif /* _Xauth_h */
nx-X11/lib/Imakefile
View file @ 2f19f2f6
......@@ -15,10 +15,6 @@ NULL =
XKBLIBDIR = xkbfile
#endif
#if BuildXauLib
XAULIBDIR = Xau
#endif
#if BuildX11Lib
X11LIBDIR = X11
#endif
......@@ -29,7 +25,6 @@ XEXTLIBDIR = Xext
LINTSUBDIRS = \
$(XAULIBDIR) \
$(X11LIBDIR) \
$(XEXTLIBDIR) \
$(XKBLIBDIR) \
......
nx-X11/lib/Xau/AuGetBest.c → nx-X11/lib/X11/AuGetBest.c
View file @ 2f19f2f6
......@@ -132,7 +132,7 @@ XauGetBestAuthByAddr (
if ((family == FamilyWild || entry->family == FamilyWild ||
(entry->family == family &&
((address_length == entry->address_length &&
binaryEqual (entry->address, address, (int)address_length))
binaryEqual (entry->address, address, (int)address_length))
#ifdef hpux
|| (family == FamilyLocal &&
fully_qual_address_length == entry->address_length &&
......
nx-X11/lib/X11/Imakefile
View file @ 2f19f2f6
......@@ -172,12 +172,6 @@ EXTRA_LIBRARIES = /**/
SETID_DEFINES = -DHASGETRESUID
#endif
XLC_DEFINES = -DXLOCALEDIR=\"$(XLOCALEDIR)\"
#if HasKrb5
K5OBJS = k5encode.o
K5SRCS = k5encode.c
K5INCL = Krb5Includes
K5DEFS = Krb5Defines
#endif
#if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
defined(OpenBSDArchitecture)
THRSTUBSRCS = UIThrStubs.c
......@@ -1082,9 +1076,6 @@ SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES))
SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES))
SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES))
#endif
#if HasKrb5
SpecialCLibObjectRule(k5encode,$(_NOOP_),$(K5INCL))
#endif
#if BuildLoadableXlibI18n
SpecialCLibObjectRuleSeparateOpts(lcInit,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES))
SpecialCLibObjectRuleSeparateOpts(lcGeneric,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES))
......@@ -1104,15 +1095,6 @@ InstallNonExecFile(XErrorDB,$(LIBDIR))
InstallNonExecFile(XKeysymDB,$(LIBDIR))
InstallLintLibrary(X11,$(LINTLIBDIR))
LinkSourceFile(AuDispose.c,$(XAUTHSRC))
LinkSourceFile(AuGetBest.c,$(XAUTHSRC))
LinkSourceFile(AuFileName.c,$(XAUTHSRC))
LinkSourceFile(AuRead.c,$(XAUTHSRC))
#if HasKrb5
LinkSourceFile(k5encode.c,$(XAUTHSRC))
#endif
#ifdef QNX4Architecture
LOCAL_LDFLAGS=-F
#endif
......
nx-X11/lib/Xau/AuGetAddr.c deleted 100644 → 0
View file @ a3a29528
/* $Xorg: AuGetAddr.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <nx-X11/Xauth.h>
#include <nx-X11/Xos.h>
static int
binaryEqual (_Xconst char *a, _Xconst char *b, int len)
{
while (len--)
if (*a++ != *b++)
return 0;
return 1;
}
Xauth *
XauGetAuthByAddr (
#if NeedWidePrototypes
unsigned int family,
unsigned int address_length,
#else
unsigned short family,
unsigned short address_length,
#endif
_Xconst char* address,
#if NeedWidePrototypes
unsigned int number_length,
#else
unsigned short number_length,
#endif
_Xconst char* number,
#if NeedWidePrototypes
unsigned int name_length,
#else
unsigned short name_length,
#endif
_Xconst char* name)
{
FILE *auth_file;
char *auth_name;
Xauth *entry;
auth_name = XauFileName ();
if (!auth_name)
return 0;
if (access (auth_name, R_OK) != 0) /* checks REAL id */
return 0;
auth_file = fopen (auth_name, "rb");
if (!auth_file)
return 0;
for (;;) {
entry = XauReadAuth (auth_file);
if (!entry)
break;
/*
* Match when:
* either family or entry->family are FamilyWild or
* family and entry->family are the same and
* address and entry->address are the same
* and
* either number or entry->number are empty or
* number and entry->number are the same
* and
* either name or entry->name are empty or
* name and entry->name are the same
*/
if ((family == FamilyWild || entry->family == FamilyWild ||
(entry->family == family &&
address_length == entry->address_length &&
binaryEqual (entry->address, address, (int)address_length))) &&
(number_length == 0 || entry->number_length == 0 ||
(number_length == entry->number_length &&
binaryEqual (entry->number, number, (int)number_length))) &&
(name_length == 0 || entry->name_length == 0 ||
(entry->name_length == name_length &&
binaryEqual (entry->name, name, (int)name_length))))
break;
XauDisposeAuth (entry);
}
(void) fclose (auth_file);
return entry;
}
nx-X11/lib/Xau/AuLock.c deleted 100644 → 0
View file @ a3a29528
/* $Xorg: AuLock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xau/AuLock.c,v 3.6 2002/05/31 18:45:43 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <nx-X11/Xauth.h>
#include <nx-X11/Xos.h>
#include <sys/stat.h>
#include <errno.h>
#include <time.h>
#define Time_t time_t
#ifndef X_NOT_POSIX
#include <unistd.h>
#else
#ifndef WIN32
extern unsigned sleep ();
#else
#include <nx-X11/Xwindows.h>
#define link rename
#endif
#endif
#ifdef __UNIXOS2__
#define link rename
#endif
int
XauLockAuth (
_Xconst char *file_name,
int retries,
int timeout,
long dead)
{
char creat_name[1025], link_name[1025];
struct stat statb;
Time_t now;
int creat_fd = -1;
if (strlen (file_name) > 1022)
return LOCK_ERROR;
(void) strcpy (creat_name, file_name);
(void) strcat (creat_name, "-c");
(void) strcpy (link_name, file_name);
(void) strcat (link_name, "-l");
if (stat (creat_name, &statb) != -1) {
now = time ((Time_t *) 0);
/*
* NFS may cause ctime to be before now, special
* case a 0 deadtime to force lock removal
*/
if (dead == 0 || now - statb.st_ctime > dead) {
(void) unlink (creat_name);
(void) unlink (link_name);
}
}
while (retries > 0) {
if (creat_fd == -1) {
creat_fd = open (creat_name, O_WRONLY | O_CREAT | O_EXCL, 0600);
if (creat_fd == -1) {
if (errno != EACCES)
return LOCK_ERROR;
} else
(void) close (creat_fd);
}
if (creat_fd != -1) {
if (link (creat_name, link_name) != -1)
return LOCK_SUCCESS;
if (errno == ENOENT) {
creat_fd = -1; /* force re-creat next time around */
continue;
}
if (errno != EEXIST)
return LOCK_ERROR;
}
(void) sleep ((unsigned) timeout);
--retries;
}
return LOCK_TIMEOUT;
}
nx-X11/lib/Xau/AuUnlock.c deleted 100644 → 0
View file @ a3a29528
/* $Xorg: AuUnlock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <nx-X11/Xauth.h>
#include <nx-X11/Xos.h>
int
XauUnlockAuth (
_Xconst char *file_name)
{
#ifndef WIN32
char creat_name[1025];
#endif
char link_name[1025];
if (strlen (file_name) > 1022)
return 0;
#ifndef WIN32
(void) strcpy (creat_name, file_name);
(void) strcat (creat_name, "-c");
#endif
(void) strcpy (link_name, file_name);
(void) strcat (link_name, "-l");
/*
* I think this is the correct order
*/
#ifndef WIN32
(void) unlink (creat_name);
#endif
(void) unlink (link_name);
return 1;
}
nx-X11/lib/Xau/AuWrite.c deleted 100644 → 0
View file @ a3a29528
/* $Xorg: AuWrite.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.3 2001/01/17 19:42:24 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <nx-X11/Xauth.h>
static int
write_short (unsigned short s, FILE *file)
{
unsigned char file_short[2];
file_short[0] = (s & (unsigned)0xff00) >> 8;
file_short[1] = s & 0xff;
if (fwrite ((char *) file_short, (int) sizeof (file_short), 1, file) != 1)
return 0;
return 1;
}
static int
write_counted_string (unsigned short count, char *string, FILE *file)
{
if (write_short (count, file) == 0)
return 0;
if (fwrite (string, (int) sizeof (char), (int) count, file) != count)
return 0;
return 1;
}
int
XauWriteAuth (auth_file, auth)
FILE *auth_file;
Xauth *auth;
{
if (write_short (auth->family, auth_file) == 0)
return 0;
if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
return 0;
if (write_counted_string (auth->number_length, auth->number, auth_file) == 0)
return 0;
if (write_counted_string (auth->name_length, auth->name, auth_file) == 0)
return 0;
if (write_counted_string (auth->data_length, auth->data, auth_file) == 0)
return 0;
return 1;
}
nx-X11/lib/Xau/Autest.c deleted 100644 → 0
View file @ a3a29528
/* $Xorg: Autest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
/*
Copyright 1988, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <nx-X11/Xauth.h>
main (argc, argv)
char **argv;
{
Xauth test_data;
char *name, *data, *file;
int state = 0;
FILE *output;
while (*++argv) {
if (!strcmp (*argv, "-file"))
file = *++argv;
else if (state == 0) {
name = *argv;
++state;
} else if (state == 1) {
data = *argv;
++state;
}
}
if(!file) {
fprintf (stderr, "No file\n");
exit (1);
}
test_data.family = 0;
test_data.address_length = 0;
test_data.address = "";
test_data.number_length = 0;
test_data.number = "";
test_data.name_length = strlen (name);
test_data.name = name;
test_data.data_length = strlen (data);
test_data.data = data;
output = fopen (file, "w");
if (output) {
XauWriteAuth (output, &test_data);
fclose (output);
}
}
nx-X11/lib/Xau/Imakefile deleted 100644 → 0
View file @ a3a29528
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:29 cpqbld Exp $
XCOMM $XdotOrg: xc/lib/Xau/Imakefile,v 1.4 2005/09/22 23:54:18 alanc Exp $
XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.5 1999/04/17 09:08:11 dawes Exp $
#define DoNormalLib NormalLibXau
#define DoSharedLib SharedLibXau
#define DoExtraLib SharedLibXau
#define DoDebugLib DebugLibXau
#define DoProfileLib ProfileLibXau
#define LibName NX_Xau
#define SoRev SOXAUTHREV
#define IncSubdir nx-X11
#include <Threads.tmpl>
#ifdef SharedXauReqs
REQUIREDLIBS = SharedXauReqs
#endif
LINTLIBS = $(LINTXLIB)
#if HasKrb5
K5ENCSRC = k5encode.c
K5ENCOBJ = k5encode.o
INCLUDES = Krb5Includes
#else
K5ENCSRC =
K5ENCOBJ =
INCLUDES =
#endif
HEADERS = \
Xauth.h
SRCS = AuDispose.c AuFileName.c AuGetAddr.c AuGetBest.c AuLock.c \
AuRead.c AuUnlock.c AuWrite.c $(K5ENCSRC)
OBJS = AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
#define IncludeSharedObjectInNormalLib
#define UnsharedLibObjCompile(options) LibObjCompile(unshared,$(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) options $(PICFLAGS))
#include <Library.tmpl>
DependTarget()
nx-X11/lib/Xau/README deleted 100644 → 0
View file @ a3a29528
A Sample Authorization Protocol for X
Overview
The following note describes a very simple mechanism for providing individual
access to an X Window System display. It uses existing core protocol and
library hooks for specifying authorization data in the connection setup block
to restrict use of the display to only those clients that show that they
know a server-specific key called a "magic cookie". This mechanism is *not*
being proposed as an addition to the Xlib standard; among other reasons, a
protocol extension is needed to support more flexible mechanisms. We have
implemented this mechanism already; if you have comments, please send them
to us.
This scheme involves changes to the following parts of the sample release:
o xdm
- generate random magic cookie and store in protected file
- pass name of magic cookie file to server
- when user logs in, add magic cookie to user's auth file
- when user logs out, generate a new cookie for server
o server
- a new command line option to specify cookie file
- check client authorization data against magic cookie
- read in cookie whenever the server resets
- do not add local machine to host list if magic cookie given
o Xlib
- read in authorization data from file
- find data for appropriate server
- send authorization data if found
o xauth [new program to manage user auth file]
- add entries to user's auth file
- remove entries from user's auth file
This mechanism assumes that the superuser and the transport layer between
the client and the server is secure. Organizations that desire stricter
security are encouraged to look at systems such as Kerberos (at Project
Athena).
Description
The sample implementation will use the xdm Display Manager to set up and
control the server's authorization file. Sites that do not run xdm will
need to build their own mechanisms.
Xdm uses a random key (seeded by the system time and check sum of /dev/kmem)
to generate a unique sequence of characters at 16 bytes long. This sequence
will be written to a file which is made readable only by the server. The
server will then be started with a command line option instructing it to use
the contents of the file as the magic cookie for connections that include
authorization data. This will also disable the server from adding the local
machine's address to the initial host list. Note that the actual cookie must
not be stored on the command line or in an environment variable, to prevent
it from being publicly obtainable by the "ps" command.
If a client presents an authorization name of "MIT-MAGIC-COOKIE-1" and
authorization data that matches the magic cookie, that client is allowed
access. If the name or data does not match and the host list is empty,
that client will be denied access. Otherwise, the existing host-based access
control will be used. Since any client that is making a connection from a
machine on the host list will be granted access even if their authorization
data is incorrect, sites are strongly urged not to set up any default hosts
using the /etc/X*.hosts files. Granting access to other machines should be
done by the user's session manager instead.
Assuming the server is configured with an empty host list, the existence of the
cookie is sufficient to ensure there will be no unauthorized access to the
display. However, xdm will (continue to) work to minimize the chances of
spoofing on servers that do not support this authorization mechanism. This
will be done by grabbing the server and the keyboard after opening the display.
This action will be surrounded by a timer which will kill the server if the
grabs cannot be done within several seconds. [This level of security is now
implemented in patches already sent out.]
After the user logs in, xdm will add authorization entries for each of the
server machine's network addresses to the user's authorization file (the format
of which is described below). This file will usually be named .Xauthority in
the users's home directory; will be owned by the user (as specified by the
pw_uid and pw_gid fields in the user's password entry), and will be accessible
only to the user (no group access). This file will contain authorization data
for all of the displays opened by the user.
When the session terminates, xdm will generate and store a new magic cookie
for the server. Then, xdm will shutdown its own connection and send a
SIGHUP to the server process, which should cause the server to reset. The
server will then read in the new magic cookie.
To support accesses (both read and write) from multiple machines (for use in
environments that use distributed file systems), file locking is done using
hard links. This is done by creat'ing (sic) a lock file and then linking it
to another name in the same directory. If the link-target already exists,
the link will fail, indicating failure to obtain the lock. Linking is used
instead of just creating the file read-only since link will fail even for
the superuser.
Problems and Solutions
There are a few problems with .Xauthority as described. If no home directory
exists, or if xdm cannot create a file there (disk full), xdm stores the
cookie in a file in a resource-specified back-up directory, and sets an
environment variable in the user's session (called XAUTHORITY) naming this
file. There is also the problem that the locking attempts will need to be
timed out, due to a leftover lock. Xdm, again, creates a file and set an
environment variable. Finally, the back-up directory might be full. Xdm,
as a last resort, provides a function key binding that allows a user to log
in without having the authorization data stored, and with host-based access
control disabled.
Xlib
XOpenDisplay in Xlib was enhanced to allow specification of authorization
information. As implied above, Xlib looks for the data in the
.Xauthority file of the home directory, or in the file pointed at by the
XAUTHORITY environment variable instead if that is defined. This required
no programmatic interface change to Xlib. In addition, a new Xlib routine
is provided to explicitly specify authorization.
XSetAuthorization(name, namelen, data, datalen)
int namelen, datalen;
char *name, *data;
There are three types of input:
name NULL, data don't care - use default authorization mechanism.
name non-NULL, data NULL - use the named authorization; get
data from that mechanism's default.
name non-NULL, data non-NULL - use the given authorization and data.
This interface is used by xdm and might also be used by any other
applications that wish to explicitly set the authorization information.
Authorization File
The .Xauthority file is a binary file consisting of a sequence of entries
in the following format:
2 bytes Family value (second byte is as in protocol HOST)
2 bytes address length (always MSB first)
A bytes host address (as in protocol HOST)
2 bytes display "number" length (always MSB first)
S bytes display "number" string
2 bytes name length (always MSB first)
N bytes authorization name string
2 bytes data length (always MSB first)
D bytes authorization data string
The format is binary for easy processing, since authorization information
usually consists of arbitrary data. Host addresses are used instead of
names to eliminate potentially time-consuming name resolutions in
XOpenDisplay. Programs, such as xdm, that initialize the user's
authorization file will have to do the same work as the server in finding
addresses for all network interfaces. If more than one entry matches the
desired address, the entry that is chosen is implementation-dependent. In
our implementation, it is always the first in the file.
The Family is specified in two bytes to allow out-of-band values
(i.e. values not in the Protocol) to be used. In particular,
two new values "FamilyLocal" and "FamilyWild" are defined. FamilyLocal
refers to any connections using a non-network method of connetion from the
local machine (Unix domain sockets, shared memory, loopback serial line).
In this case the host address is specified by the data returned from
gethostname() and better be unique in a collection of machines
which share NFS directories. FamilyWild is currently used only
by xdm to communicate authorization data to the server. It matches
any family/host address pair.
For FamilyInternet, the host address is the 4 byte internet address, for
FamilyDecnet, the host address is the byte decnet address, for FamilyChaos
the address is also two bytes.
The Display Number is the ascii representation of the display number
portion of the display name. It is in ascii to allow future expansion
to PseudoRoots or anything else that might happen.
A utility called "xauth" will be provided for editing and viewing the
contents of authorization files. Note that the user's authorization file is
not the same as the server's magic cookie file.
nx-X11/lib/Xau/k5encode.c deleted 100644 → 0
View file @ a3a29528
/* $Xorg: k5encode.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */
/*
Copyright 1993, 1994, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
/*
* functions to encode/decode Kerberos V5 principals
* into something that can be reasonable spewed over
* the wire
*
* Author: Tom Yu <tlyu@MIT.EDU>
*
* Still needs to be fixed up wrt signed/unsigned lengths, but we'll worry
* about that later.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <krb5/krb5.h>
/* 9/93: krb5.h leaks some symbols */
#undef BITS32
#undef xfree
#include <nx-X11/X.h>
#include <nx-X11/Xos.h>
#include <nx-X11/Xmd.h>
#include <nx-X11/Xfuncs.h>
/*
* XauKrb5Encode
*
* this function encodes the principal passed to it in a format that can
* easily be dealt with by stuffing it into an X packet. Encoding is as
* follows:
* length count of the realm name
* realm
* component count
* length of component
* actual principal component
* etc....
*
* Note that this function allocates a hunk of memory, which must be
* freed to avoid nasty memory leak type things. All counts are
* byte-swapped if needed. (except for the total length returned)
*
* nevermind.... stuffing the encoded packet in net byte order just to
* always do the right thing. Don't have to frob with alignment that way.
*/
int
XauKrb5Encode(princ, outbuf)
krb5_principal princ; /* principal to encode */
krb5_data *outbuf; /* output buffer */
{
CARD16 i, numparts, totlen = 0, plen, rlen;
char *cp, *pdata;
rlen = krb5_princ_realm(princ)->length;
numparts = krb5_princ_size(princ);
totlen = 2 + rlen + 2; /* include room for realm length
and component count */
for (i = 0; i < numparts; i++)
totlen += krb5_princ_component(princ, i)->length + 2;
/* add 2 bytes each time for length */
if ((outbuf->data = (char *)malloc(totlen)) == NULL)
return -1;
cp = outbuf->data;
*cp++ = (char)((int)(0xff00 & rlen) >> 8);
*cp++ = (char)(0x00ff & rlen);
memcpy(cp, krb5_princ_realm(princ)->data, rlen);
cp += rlen;
*cp++ = (char)((int)(0xff00 & numparts) >> 8);
*cp++ = (char)(0x00ff & numparts);
for (i = 0; i < numparts; i++)
{
plen = krb5_princ_component(princ, i)->length;
pdata = krb5_princ_component(princ, i)->data;
*cp++ = (char)((int)(0xff00 & plen) >> 8);
*cp++ = (char)(0x00ff & plen);
memcpy(cp, pdata, plen);
cp += plen;
}
outbuf->length = totlen;
return 0;
}
/*
* XauKrb5Decode
*
* This function essentially reverses what XauKrb5Encode does.
* return value: 0 if okay, -1 if malloc fails, -2 if inbuf format bad
*/
int
XauKrb5Decode(inbuf, princ)
krb5_data inbuf;
krb5_principal *princ;
{
CARD16 i, numparts, plen, rlen;
CARD8 *cp, *pdata;
if (inbuf.length < 4)
{
return -2;
}
*princ = (krb5_principal)malloc(sizeof (krb5_principal_data));
if (*princ == NULL)
return -1;
bzero(*princ, sizeof (krb5_principal_data));
cp = (CARD8 *)inbuf.data;
rlen = *cp++ << 8;
rlen |= *cp++;
if (inbuf.length < 4 + (int)rlen + 2)
{
krb5_free_principal(*princ);
return -2;
}
krb5_princ_realm(*princ)->data = (char *)malloc(rlen);
if (krb5_princ_realm(*princ)->data == NULL)
{
krb5_free_principal(*princ);
return -1;
}
krb5_princ_realm(*princ)->length = rlen;
memcpy(krb5_princ_realm(*princ)->data, cp, rlen);
cp += rlen;
numparts = *cp++ << 8;
numparts |= *cp++;
krb5_princ_name(*princ) =
(krb5_data *)malloc(numparts * sizeof (krb5_data));
if (krb5_princ_name(*princ) == NULL)
{
krb5_free_principal(*princ);
return -1;
}
krb5_princ_size(*princ) = 0;
for (i = 0; i < numparts; i++)
{
if (cp + 2 > (CARD8 *)inbuf.data + inbuf.length)
{
krb5_free_principal(*princ);
return -2;
}
plen = *cp++ << 8;
plen |= *cp++;
if (cp + plen > (CARD8 *)inbuf.data + inbuf.length)
{
krb5_free_principal(*princ);
return -2;
}
pdata = (CARD8 *)malloc(plen);
if (pdata == NULL)
{
krb5_free_principal(*princ);
return -1;
}
krb5_princ_component(*princ, i)->data = (char *)pdata;
krb5_princ_component(*princ, i)->length = plen;
memcpy(pdata, cp, plen);
cp += plen;
krb5_princ_size(*princ)++;
}
return 0;
}
nx-X11/programs/Imakefile
View file @ 2f19f2f6
......@@ -22,11 +22,7 @@
XSSRCDIR = Xserver
#endif
#if defined(NXEmbeddedXServer)
SUBDIRS = $(XSSRCDIR)
#else
SUBDIRS = $(XSSRCDIR) nxauth
#endif
MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
nx-X11/programs/Xserver/Imakefile
View file @ 2f19f2f6
......@@ -163,7 +163,7 @@ INSTPGMFLAGS =
$(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \
$(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \
$(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR)
OS = os/LibraryTargetName(os) $(DEPXAUTHLIB)
OS = os/LibraryTargetName(os)
BSDEMUL = $(DEPXBSDLIB)
#if DoLoadableServer
MFB = mfb/ModuleLibraryTargetName(mfb)
......@@ -246,7 +246,7 @@ INSTPGMFLAGS =
#if !(SystemV4 || defined(SGIArchitecture) || UseRgbTxt)
DBMLIBS = DBMLibrary
#endif
SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(DBMLIBS) $(USB) \
SYSLIBS = $(ZLIB) MathLibrary $(DBMLIBS) $(USB) \
$(PAMLIBS) $(EXTRASYSLIBS)
#if !HasCbrt
CBRT = mi/LibraryTargetName(cbrt)
......
nx-X11/programs/Xserver/dix/Imakefile
View file @ 2f19f2f6
......@@ -126,10 +126,6 @@ VENDORRELEASE = XVendorRelease
VENDOR_RELEASE = -DVENDOR_RELEASE="$(VENDORRELEASE)"
#endif
#if HasKrb5
K5DEFS = Krb5Defines
#endif
#ifdef DarwinArchitecture
#if DarwinQuartzSupport
QUARTZ_DEFINES = -DDARWIN_WITH_QUARTZ
......@@ -146,8 +142,6 @@ LintLibraryTarget(dix,$(SRCS) $(XPSRC))
NormalLintTarget($(SRCS) $(XPSRC))
SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
SpecialCObjectRule(tables,$(ICONFIGFILES),$(K5DEFS))
SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(K5DEFS))
SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES))
SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
......
nx-X11/programs/Xserver/dix/dispatch.c
View file @ 2f19f2f6
......@@ -955,10 +955,6 @@ ProcGetAtomName(register ClientPtr client)
}
}
#ifdef K5AUTH
extern int k5_bad();
#endif
#ifndef NXAGENT_SERVER
int
ProcSetSelectionOwner(register ClientPtr client)
......@@ -3506,12 +3502,6 @@ InitProcVectors(void)
ProcVector[i] = SwappedProcVector[i] = ProcBadRequest;
ReplySwapVector[i] = ReplyNotSwappd;
}
#ifdef K5AUTH
if (!k5_Vector[i])
{
k5_Vector[i] = k5_bad;
}
#endif
}
for(i = LASTEvent; i < 128; i++)
{
......
nx-X11/programs/Xserver/dix/tables.c
View file @ 2f19f2f6
......@@ -63,11 +63,6 @@ SOFTWARE.
#include "swaprep.h"
#include "swapreq.h"
#ifdef K5AUTH
extern int
k5_stage1(), k5_stage2(), k5_stage3(), k5_bad();
#endif
int (* InitialVector[3]) (
ClientPtr /* client */
) =
......@@ -517,13 +512,3 @@ ReplySwapPtr ReplySwapVector[256] =
ReplyNotSwappd, /* NoOperation */
ReplyNotSwappd
};
#ifdef K5AUTH
int (*k5_Vector[256])() =
{
k5_bad,
k5_stage1,
k5_bad,
k5_stage3
};
#endif
nx-X11/programs/Xserver/include/dixstruct.h
View file @ 2f19f2f6
......@@ -219,10 +219,6 @@ extern int (* ProcVector[256]) (ClientPtr /*client*/);
extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
#ifdef K5AUTH
extern int (*k5_Vector[256])(ClientPtr /*client*/);
#endif
extern ReplySwapPtr ReplySwapVector[256];
extern int ProcBadRequest(ClientPtr /*client*/);
......
nx-X11/programs/Xserver/os/Imakefile
View file @ 2f19f2f6
......@@ -78,11 +78,6 @@ RPCOBJS =
RPCSRCS =
#endif
#if HasKrb5
KRB5OBJS = k5auth.o k5encode.o
KRB5SRCS = k5auth.c k5encode.c
#endif
#if HasBSD44Sockets
SOCK_DEFINES = -DBSD44SOCKETS
#endif
......@@ -122,12 +117,12 @@ GETPEER_DEFINES = -DHAS_GETPEEREID
BOOTSTRAPCFLAGS =
SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \
osinit.c utils.c log.c auth.c mitauth.c secauth.c \
$(XDMAUTHSRCS) $(RPCSRCS) $(KRB5SRCS) xdmcp.c OtherSources \
$(XDMAUTHSRCS) $(RPCSRCS) xdmcp.c OtherSources \
transport.c $(SNPRINTF_SRCS) $(STRLCAT_SRCS) \
$(MALLOC_SRCS) xprintf.c
OBJS = WaitFor.o access.o connection.o io.o $(COLOR_OBJS) \
osinit.o utils.o log.o auth.o mitauth.o secauth.o \
$(XDMAUTHOBJS) $(RPCOBJS) $(KRB5OBJS) xdmcp.o OtherObjects \
$(XDMAUTHOBJS) $(RPCOBJS) xdmcp.o OtherObjects \
transport.o $(SNPRINTF_OBJS) $(STRLCAT_OBJS) \
$(MALLOC_OBJS) xprintf.o
......@@ -146,7 +141,6 @@ BOOTSTRAPCFLAGS =
DBM_DEFINES = NdbmDefines
ADM_DEFINES = -DADMPATH=\"$(ADMDIR)/X\%smsgs\"
XDMCP_DEFINES = ServerXdmcpDefines
KRB5_DEFINES = Krb5Defines
XALLOC_DEFINES = XallocDefines
ERROR_DEFINES = ServerErrorDefines
#if HasPam && HasPamMisc
......@@ -154,11 +148,11 @@ BOOTSTRAPCFLAGS =
#endif
DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) \
$(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \
$(KRB5_DEFINES) $(RGB_DEFINES) $(GETPEER_DEFINES) \
$(RGB_DEFINES) $(GETPEER_DEFINES) \
$(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES) $(NX_DEFINES)
INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \
-I$(TOP)/lib/Xau Krb5Includes $(NX_INCLUDES) \
-I$(TOP)/lib/Xau $(NX_INCLUDES) \
`pkg-config --cflags-only-I pixman-1`
DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
$(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
......@@ -204,10 +198,6 @@ oscolor.o: oscolor.c $(ICONFIGFILES)
SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES))
#endif
#if HasKrb5
LinkSourceFile(k5encode.c,$(XAUTHSRC))
#endif
#if !HasSnprintf
LinkSourceFile(snprintf.c,$(LIBSRC)/misc)
#endif
......
nx-X11/programs/Xserver/os/access.c
View file @ 2f19f2f6
......@@ -1170,10 +1170,6 @@ ResetHosts (char *display)
struct nodeent *np;
struct dn_naddr dnaddr, *dnaddrp, *dnet_addr();
#endif
#ifdef K5AUTH
krb5_principal princ;
krb5_data kbuf;
#endif
int family = 0;
void *addr;
int len;
......@@ -1249,13 +1245,6 @@ ResetHosts (char *display)
hostname = ohostname + 4;
}
#endif
#ifdef K5AUTH
else if (!strncmp("krb:", lhostname, 4))
{
family = FamilyKrb5Principal;
hostname = ohostname + 4;
}
#endif
else if (!strncmp("si:", lhostname, 3))
{
family = FamilyServerInterpreted;
......@@ -1298,16 +1287,6 @@ ResetHosts (char *display)
}
else
#endif /* DNETCONN */
#ifdef K5AUTH
if (family == FamilyKrb5Principal)
{
krb5_parse_name(hostname, &princ);
XauKrb5Encode(princ, &kbuf);
(void) NewHost(FamilyKrb5Principal, kbuf.data, kbuf.length, FALSE);
krb5_free_principal(princ);
}
else
#endif
#ifdef SECURE_RPC
if ((family == FamilyNetname) || (strchr(hostname, '@')))
{
......@@ -1553,11 +1532,6 @@ AddHost (ClientPtr client,
len = length;
LocalHostEnabled = TRUE;
break;
#ifdef K5AUTH
case FamilyKrb5Principal:
len = length;
break;
#endif
#ifdef SECURE_RPC
case FamilyNetname:
len = length;
......@@ -1656,11 +1630,6 @@ RemoveHost (
len = length;
LocalHostEnabled = FALSE;
break;
#ifdef K5AUTH
case FamilyKrb5Principal:
len = length;
break;
#endif
#ifdef SECURE_RPC
case FamilyNetname:
len = length;
......
nx-X11/programs/Xserver/os/auth.c
View file @ 2f19f2f6
......@@ -54,9 +54,6 @@ from The Open Group.
#include <dix-config.h>
#endif
#ifdef K5AUTH
# include <krb5/krb5.h>
#endif
# include <nx-X11/X.h>
# include <nx-X11/Xauth.h>
# include "misc.h"
......@@ -112,15 +109,6 @@ static struct protocol protocols[] = {
#endif
},
#endif
#ifdef K5AUTH
{ (unsigned short) 14, "MIT-KERBEROS-5",
K5Add, K5Check, K5Reset,
K5ToID, K5FromID, K5Remove,
#ifdef XCSECURITY
NULL
#endif
},
#endif
#ifdef XCSECURITY
{ (unsigned short) XSecurityAuthorizationNameLen,
XSecurityAuthorizationName,
......
nx-X11/programs/Xserver/os/osdep.h
View file @ 2f19f2f6
......@@ -145,16 +145,6 @@ typedef struct _connectionOutput {
int count;
} ConnectionOutput, *ConnectionOutputPtr;
#ifdef K5AUTH
typedef struct _k5_state {
int stageno; /* current stage of auth protocol */
void *srvcreds; /* server credentials */
void *srvname; /* server principal name */
void *ktname; /* key table: principal-key pairs */
void *skey; /* session key */
} k5_state;
#endif
struct _osComm;
#define AuthInitArgs void
......@@ -190,9 +180,6 @@ typedef struct _osComm {
ConnectionInputPtr input;
ConnectionOutputPtr output;
XID auth_id; /* authorization id */
#ifdef K5AUTH
k5_state authstate; /* state of setup auth conversation */
#endif
CARD32 conn_time; /* timestamp if not established, else 0 */
struct _XtransConnInfo *trans_conn; /* transport connection object */
} OsCommRec, *OsCommPtr;
......@@ -283,16 +270,6 @@ extern int SecureRPCRemove (AuthRemCArgs);
extern int SecureRPCReset (AuthRstCArgs);
#endif
/* in k5auth.c */
#ifdef K5AUTH
extern XID K5Check (AuthCheckArgs);
extern XID K5ToID (AuthToIDArgs);
extern int K5Add (AuthAddCArgs);
extern int K5FromID (AuthFromIDArgs);
extern int K5Remove (AuthRemCArgs);
extern int K5Reset (AuthRstCArgs);
#endif
/* in secauth.c */
extern XID AuthSecurityCheck (AuthCheckArgs);
......
nx-X11/programs/Xserver/os/rpcauth.c
View file @ 2f19f2f6
......@@ -41,7 +41,7 @@ from The Open Group.
#ifdef SECURE_RPC
#include <nx-X11/X.h>
#include "Xauth.h"
#include <nx-X11/Xauth.h>
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
......
nx-X11/programs/nxauth/CHANGELOG deleted 100644 → 0
View file @ a3a29528
ChangeLog:
nxauth-3.5.0-1
- Opened the 3.5.0 branch based on nxauth-3.4.0-3.
- Updated copyright to year 2011.
nxauth-3.4.0-3
- Updated the launchd socket detection to support OSX versions relea-
sed so far.
nxauth-3.4.0-2
- Updated copyright to year 2010.
nxauth-3.4.0-1
- Opened the 3.4.0 branch based on nxauth-3.3.0-1.
- Updated copyright to year 2009.
nxauth-3.3.0-1
- Opened the 3.3.0 branch based on nxauth-3.2.0-1.
nxauth-3.2.0-1
- Opened the 3.2.0 branch based on nxauth-3.1.0-2.
nxauth-3.1.0-2
- Added support for launchd socket.
nxauth-3.1.0-1
- Opened the 3.1.0 branch based on nxauth-3.0.0-6.
nxauth-3.0.0-6
- Updated the NoMachine copyright notice.
nxauth-3.0.0-5
- Changed the copyright attribution from Medialogic to NoMachine.
nxauth-3.0.0-4
- Changed the LICENSE file to state that the software is only made
available under the version 2 of the GPL.
- Added file COPYING.
nxauth-3.0.0-3
- Updated copyright notices to year 2007.
nxauth-3.0.0-2
- Imported changes up to nxauth-2.1.0-1.
- Ignoring lock on '.Xauthority' file.
- Using '__CYGWIN__' definition in process.c. 'WIN32' is not defined
during compilation under nx-X11 and wrong code block is used to
rename xauth temporary file.
nxauth-3.0.0-1
- Opened the 3.0.0 branch based on nxauth-2.0.0-2.
nxauth-2.0.0-2
- Updated the NoMachine copyright notices.
nxauth-2.0.0-1
- Opened the 2.0.0 branch based on the 1.6.0-1.
nxauth-1.6.0-1
- Opened the 1.6.0 branch based on nxauth-1.5.0-1.
nxauth-1.5.0-1
- Opened the 1.5.0 branch.
nxauth-1.4.1-1
- Opened the 1.4.1 branch.
nxauth-1.4.0-2
- Removed debug message 'host name is'.
nxauth-1.4.0-1
- Opened the 1.4.0 branch based on nxauth-1.3.2-1.
nxauth-1.3.2-1
- Opened the 1.3.2 branch.
nxauth-1.3.1-2
- Fixed problem with compilation on systems without
X11 includes instaled.
nx-X11/programs/nxauth/Imakefile deleted 100644 → 0
View file @ a3a29528
XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:11 cpqbld Exp $
XCOMM $XFree86: xc/programs/xauth/Imakefile,v 3.5 2001/03/30 02:15:23 keithp Exp $
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAUTH, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
/* software is allowed according to terms specified in the file LICENSE */
/* which comes in the source distribution. */
/* */
/* Check http://www.nomachine.com/licensing.html for applicability. */
/* */
/* NX and NoMachine are trademarks of Medialogic S.p.A. */
/* */
/* All rights reserved. */
/* */
/**************************************************************************/
/* LOCAL_LIBRARIES = $(DESTDIR)$(SHLIBDIR)/libXau.a */
INCLUDES=-I../../lib
DEPLIBS = $(DEPXAUTHLIB)
LOCAL_LIBRARIES = $(XAUTHLIB)
SRCS = xauth.c gethost.c process.c parsedpy.c
OBJS = xauth.o gethost.o process.o parsedpy.o
CONN_DEFINES = $(CONNECTION_FLAGS)
ComplexProgramTarget(nxauth)
SpecialCObjectRule(gethost,$(ICONFIGFILES),$(CONN_DEFINES) $(SIGNAL_DEFINES))
SpecialCObjectRule(process,$(ICONFIGFILES),$(SIGNAL_DEFINES))
SpecialCObjectRule(parsedpy,$(ICONFIGFILES),$(CONN_DEFINES))
nx-X11/programs/nxauth/LICENSE deleted 100644 → 0
View file @ a3a29528
Copyright (c) 2001, 2010 NoMachine - http://www.nomachine.com/.
NXAUTH and NX extensions to X are copyright of NoMachine.
Redistribution and use of this software is allowed according to the
following terms:
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License Version 2, and
not any other version, as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTA-
BILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, you can request a copy to NoMachine
or write to the Free Software Foundation, Inc., 59 Temple Place,
Suite 330, Boston, MA 02111-1307 USA
Parts of this software are derived from XFree86 project. Other copy-
rights and the MIT/X11 license applies to different sources. Please
check the applicable copyrights in each file or subdirectory.
All rights reserved.
nx-X11/programs/nxauth/gethost.c deleted 100644 → 0
View file @ a3a29528
/*
* $Xorg: gethost.c,v 1.5 2001/02/09 02:05:38 xorgcvs Exp $
*
*
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
* *
* Author: Jim Fulton, MIT X Consortium
*/
/* $XFree86: xc/programs/xauth/gethost.c,v 3.16 2001/12/14 20:01:14 dawes Exp $ */
/* sorry, streams support does not really work yet */
#if defined(STREAMSCONN) && defined(SVR4)
#undef STREAMSCONN
#define TCPCONN
#endif
#ifdef WIN32
#include <nx-X11/Xwinsock.h>
#define EPROTOTYPE WSAEPROTOTYPE
#endif
#include <nx-X11/X.h>
#include <signal.h>
#include <setjmp.h>
#include <ctype.h>
#ifndef __TYPES__
#include <sys/types.h>
#define __TYPES__
#endif
#ifndef WIN32
#ifndef STREAMSCONN
#ifndef Lynx
#include <sys/socket.h>
#else
#include <socket.h>
#endif
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#ifdef SYSV
#ifdef i386
#ifndef sco
#include <net/errno.h>
#endif /* !sco */
#endif /* i386 */
#endif /* SYSV */
#endif /* !STREAMSCONN */
#endif /* !WIN32 */
#include <errno.h>
#include "xauth.h"
#ifdef DNETCONN
#include <netdnet/dn.h>
#include <netdnet/dnetdb.h>
#endif
#ifdef SIGALRM
Bool nameserver_timedout = False;
/*
* get_hostname - Given an internet address, return a name (CHARON.MIT.EDU)
* or a string representing the address (18.58.0.13) if the name cannot
* be found. Stolen from xhost.
*/
static jmp_buf env;
static
#ifdef SIGNALRETURNSINT
int
#else
void
#endif
nameserver_lost(int sig)
{
nameserver_timedout = True;
longjmp (env, -1);
/* NOTREACHED */
#ifdef SIGNALRETURNSINT
return -1; /* for picky compilers */
#endif
}
#endif
char *
get_hostname (auth)
Xauth *auth;
{
static struct hostent *hp = NULL;
#ifdef DNETCONN
struct nodeent *np;
static char nodeaddr[4 + 2 * DN_MAXADDL];
#endif /* DNETCONN */
if (auth->address_length == 0)
return "Illegal Address";
#ifdef TCPCONN
if (auth->family == FamilyInternet) {
#ifdef SIGALRM
/* gethostbyaddr can take a LONG time if the host does not exist.
Assume that if it does not respond in NAMESERVER_TIMEOUT seconds
that something is wrong and do not make the user wait.
gethostbyaddr will continue after a signal, so we have to
jump out of it.
*/
nameserver_timedout = False;
signal (SIGALRM, nameserver_lost);
alarm (4);
if (setjmp(env) == 0) {
#endif
hp = gethostbyaddr (auth->address, auth->address_length, AF_INET);
#ifdef SIGALRM
}
alarm (0);
#endif
if (hp)
return (hp->h_name);
else
return (inet_ntoa(*((struct in_addr *)(auth->address))));
}
#endif
#ifdef DNETCONN
if (auth->family == FamilyDECnet) {
struct dn_naddr *addr_ptr = (struct dn_naddr *) auth->address;
if (np = getnodebyaddr(addr_ptr->a_addr, addr_ptr->a_len, AF_DECnet)) {
sprintf(nodeaddr, "%s:", np->n_name);
} else {
sprintf(nodeaddr, "%s:", dnet_htoa(auth->address));
}
return(nodeaddr);
}
#endif
return (NULL);
}
#ifdef TCPCONN
/*
* cribbed from lib/X/XConnDis.c
*/
static Bool
get_inet_address(char *name, unsigned int *resultp)
{
unsigned int hostinetaddr = inet_addr (name);
struct hostent *host_ptr;
struct sockaddr_in inaddr; /* dummy variable for size calcs */
#ifndef INADDR_NONE
#define INADDR_NONE -1
#endif
if (hostinetaddr == INADDR_NONE) {
if ((host_ptr = gethostbyname (name)) == NULL) {
/* No such host! */
errno = EINVAL;
return False;
}
/* Check the address type for an internet host. */
if (host_ptr->h_addrtype != AF_INET) {
/* Not an Internet host! */
errno = EPROTOTYPE;
return False;
}
memmove( (char *)&hostinetaddr, (char *)host_ptr->h_addr,
sizeof(inaddr.sin_addr));
}
*resultp = hostinetaddr;
return True;
}
#endif
#ifdef DNETCONN
static Bool get_dnet_address (name, resultp)
char *name;
struct dn_naddr *resultp;
{
struct dn_naddr *dnaddrp, dnaddr;
struct nodeent *np;
if (dnaddrp = dnet_addr (name)) { /* stolen from xhost */
dnaddr = *dnaddrp;
} else {
if ((np = getnodebyname (name)) == NULL) return False;
dnaddr.a_len = np->n_length;
memmove( dnaddr.a_addr, np->n_addr, np->n_length);
}
*resultp = dnaddr;
return True;
}
#endif
char *get_address_info (family, fulldpyname, prefix, host, lenp)
int family;
char *fulldpyname;
int prefix;
char *host;
int *lenp;
{
char *retval = NULL;
int len = 0;
char *src = NULL;
#ifdef TCPCONN
unsigned int hostinetaddr;
#endif
#ifdef DNETCONN
struct dn_naddr dnaddr;
#endif
char buf[255];
/*
* based on the family, set the pointer src to the start of the address
* information to be copied and set len to the number of bytes.
*/
switch (family) {
case FamilyLocal: /* hostname/unix:0 */
/* handle unix:0 and :0 specially */
if (prefix == 0 && (strncmp (fulldpyname, "unix:", 5) == 0 ||
fulldpyname[0] == ':')) {
if (!get_local_hostname (buf, sizeof buf)) {
len = 0;
} else {
src = buf;
len = strlen (buf);
}
} else {
src = fulldpyname;
len = prefix;
}
break;
case FamilyInternet: /* host:0 */
#ifdef TCPCONN
if (!get_inet_address (host, &hostinetaddr)) return NULL;
src = (char *) &hostinetaddr;
len = 4; /* sizeof inaddr.sin_addr, would fail on Cray */
break;
#else
return NULL;
#endif
case FamilyDECnet: /* host::0 */
#ifdef DNETCONN
if (!get_dnet_address (host, &dnaddr)) return NULL;
src = (char *) &dnaddr;
len = (sizeof dnaddr);
break;
#else
/* fall through since we don't have code for it */
#endif
default:
src = NULL;
len = 0;
}
/*
* if source was provided, allocate space and copy it
*/
if (len == 0 || !src) return NULL;
retval = malloc (len);
if (retval) {
memmove( retval, src, len);
*lenp = len;
}
return retval;
}
nx-X11/programs/nxauth/parsedpy.c deleted 100644 → 0
View file @ a3a29528
/*
* $Xorg: parsedpy.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
*
* parse_displayname - utility routine for splitting up display name strings
*
*
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
* *
* Author: Jim Fulton, MIT X Consortium
*/
/* $XFree86: xc/programs/xauth/parsedpy.c,v 3.6 2001/12/14 20:01:15 dawes Exp $ */
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAUTH, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
/* software is allowed according to terms specified in the file LICENSE */
/* which comes in the source distribution. */
/* */
/* Check http://www.nomachine.com/licensing.html for applicability. */
/* */
/* NX and NoMachine are trademarks of Medialogic S.p.A. */
/* */
/* All rights reserved. */
/* */
/**************************************************************************/
#include <stdio.h> /* for NULL */
#include <ctype.h> /* for isascii() and isdigit() */
#include <nx-X11/Xos.h> /* for strchr() and string routines */
#include <nx-X11/Xlib.h> /* for Family contants */
#ifdef hpux
#include <sys/utsname.h> /* for struct utsname */
#endif
#include <nx-X11/Xauth.h> /* for FamilyLocal */
#if defined(UNIXCONN) || defined(LOCALCONN)
#define UNIX_CONNECTION "unix"
#define UNIX_CONNECTION_LENGTH 4
#endif
#include <stdlib.h>
#include "xauth.h"
#define PANIC
#define WARNING
#undef TEST
#undef DEBUG
/*
* private utility routines
*/
char *
copystring (char *src, int len)
{
char *cp;
if (!src && len != 0) return NULL;
cp = malloc (len + 1);
if (cp) {
if (src) strncpy (cp, src, len);
cp[len] = '\0';
}
return cp;
}
char *
get_local_hostname (char *buf, int maxlen)
{
buf[0] = '\0';
/*
(void) XmuGetHostname (buf, maxlen);
*/
/*FIXME*/
(void) gethostname (buf, maxlen);
buf [maxlen - 1] = '\0';
#ifdef TEST
printf("get_local_hostname: Host name is %s", buf);
#endif
return (buf[0] ? buf : NULL);
}
#ifndef UNIXCONN
static char *
copyhostname (void)
{
char buf[256];
return (get_local_hostname (buf, sizeof buf) ?
copystring (buf, strlen (buf)) : NULL);
}
#endif
/*
* parse_displayname - display a display string up into its component parts
*/
Bool
parse_displayname (char *displayname,
int *familyp, /* return */
char **hostp, /* return */
int *dpynump, /* return */
int *scrnump, /* return */
char **restp) /* return */
{
char *ptr; /* work variables */
int len; /* work variable */
int family = -1; /* value to be returned */
char *host = NULL; /* must free if set and error return */
int dpynum = -1; /* value to be returned */
int scrnum = 0; /* value to be returned */
char *rest = NULL; /* must free if set and error return */
Bool dnet = False; /* if true then using DECnet */
/* check the name */
if (!displayname || !displayname[0]) return False;
/* must have at least :number */
ptr = strchr(displayname, ':');
if (!ptr || !ptr[1]) return False;
if (ptr[1] == ':') {
if (ptr[2] == '\0') return False;
dnet = True;
}
/*
* get the host string; if none is given, use the most effiecient path
*/
len = (ptr - displayname); /* length of host name */
if (len == 0) { /* choose most efficient path */
#if defined(UNIXCONN) || defined(LOCALCONN)
host = copystring (UNIX_CONNECTION, UNIX_CONNECTION_LENGTH);
family = FamilyLocal;
#else
if (dnet) {
host = copystring ("0", 1);
family = FamilyDECnet;
} else {
host = copyhostname ();
family = FamilyInternet;
}
#endif
} else {
host = copystring (displayname, len);
if (dnet) {
family = dnet;
} else {
#if defined(UNIXCONN) || defined(LOCALCONN)
if (host && strcmp (host, UNIX_CONNECTION) == 0)
family = FamilyLocal;
else
#endif
family = FamilyInternet;
}
}
if (!host) return False;
/*
* get the display number; we know that there is something after the
* colon (or colons) from above. note that host is now set and must
* be freed if there is an error.
*/
if (dnet) ptr++; /* skip the extra DECnet colon */
ptr++; /* move to start of display num */
{
register char *cp;
for (cp = ptr; *cp && isascii(*cp) && isdigit(*cp); cp++) ;
len = (cp - ptr);
/* check present and valid follow */
if (len == 0 || (*cp && *cp != '.')) {
free (host);
return False;
}
dpynum = atoi (ptr); /* it will handle num. as well */
ptr = cp;
}
/*
* now get screen number if given; ptr may point to nul at this point
*/
if (ptr[0] == '.') {
register char *cp;
ptr++;
for (cp = ptr; *cp && isascii(*cp) && isdigit(*cp); cp++) ;
len = (cp - ptr);
if (len == 0 || (*cp && *cp != '.')) { /* all prop name */
free (host);
return False;
}
scrnum = atoi (ptr); /* it will handle num. as well */
ptr = cp;
}
/*
* and finally, get any additional stuff that might be following the
* the screen number; ptr must point to a period if there is anything
*/
if (ptr[0] == '.') {
ptr++;
len = strlen (ptr);
if (len > 0) {
rest = copystring (ptr, len);
if (!rest) {
free (host);
return False;
}
}
}
/*
* and we are done!
*/
*familyp = family;
*hostp = host;
*dpynump = dpynum;
*scrnump = scrnum;
*restp = rest;
return True;
}
nx-X11/programs/nxauth/xauth.c deleted 100644 → 0
View file @ a3a29528
/*
* $Xorg: xauth.c,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
*
* xauth - manipulate authorization file
*
*
Copyright 1989,1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
* *
* Author: Jim Fulton, MIT X Consortium
*/
/* $XFree86: xc/programs/xauth/xauth.c,v 1.5 2001/12/14 20:01:15 dawes Exp $ */
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2010 NoMachine, http://www.nomachine.com/. */
/* */
/* NXAUTH, NX protocol compression and NX extensions to this software */
/* are copyright of NoMachine. Redistribution and use of the present */
/* software is allowed according to terms specified in the file LICENSE */
/* which comes in the source distribution. */
/* */
/* Check http://www.nomachine.com/licensing.html for applicability. */
/* */
/* NX and NoMachine are trademarks of Medialogic S.p.A. */
/* */
/* All rights reserved. */
/* */
/**************************************************************************/
#include "xauth.h"
/*
* global data
*/
char *ProgramName; /* argv[0], set at top of main() */
int verbose = -1; /* print certain messages */
Bool ignore_locks = True; /* for error recovery */
Bool break_locks = False; /* for error recovery */
/*
* local data
*/
static char *authfilename = NULL; /* filename of cookie file */
static char *defcmds[] = { "source", "-", NULL }; /* default command */
static int ndefcmds = 2;
static char *defsource = "(stdin)";
/*
* utility routines
*/
static void
usage(void)
{
static char *prefixmsg[] = {
"",
"where options include:",
" -f authfilename name of authority file to use",
" -v turn on extra messages",
" -q turn off extra messages",
" -i ignore locks on authority file",
" -b break locks on authority file",
"",
"and commands have the following syntax:",
"",
NULL };
static char *suffixmsg[] = {
"A dash may be used with the \"merge\" and \"source\" to read from the",
"standard input. Commands beginning with \"n\" use numeric format.",
"",
NULL };
char **msg;
fprintf (stderr, "usage: %s [-options ...] [command arg ...]\n",
ProgramName);
for (msg = prefixmsg; *msg; msg++) {
fprintf (stderr, "%s\n", *msg);
}
print_help (stderr, NULL, " "); /* match prefix indentation */
fprintf (stderr, "\n");
for (msg = suffixmsg; *msg; msg++) {
fprintf (stderr, "%s\n", *msg);
}
exit (1);
}
/*
* The main routine - parses command line and calls action procedures
*/
int
main(int argc, char *argv[])
{
int i;
char *sourcename = defsource;
char **arglist = defcmds;
int nargs = ndefcmds;
int status;
ProgramName = argv[0];
for (i = 1; i < argc; i++) {
char *arg = argv[i];
if (arg[0] == '-') {
char *flag;
for (flag = (arg + 1); *flag; flag++) {
switch (*flag) {
case 'f': /* -f authfilename */
if (++i >= argc) usage ();
authfilename = argv[i];
continue;
case 'v': /* -v */
verbose = 1;
continue;
case 'q': /* -q */
verbose = 0;
continue;
case 'b': /* -b */
break_locks = True;
continue;
case 'i': /* -i */
ignore_locks = True;
continue;
default:
usage ();
}
}
} else {
sourcename = "(argv)";
nargs = argc - i;
arglist = argv + i;
if (verbose == -1) verbose = 0;
break;
}
}
if (verbose == -1) { /* set default, don't junk stdout */
verbose = (isatty(fileno(stdout)) != 0);
}
if (!authfilename) {
authfilename = XauFileName (); /* static name, do not free */
if (!authfilename) {
fprintf (stderr,
"%s: unable to generate an authority file name\n",
ProgramName);
exit (1);
}
}
if (auth_initialize (authfilename) != 0) {
/* error message printed in auth_initialize */
exit (1);
}
status = process_command (sourcename, 1, nargs, arglist);
(void) auth_finalize ();
exit ((status != 0) ? 1 : 0);
}
nx-X11/programs/nxauth/xauth.h deleted 100644 → 0
View file @ a3a29528
/*
* $Xorg: xauth.h,v 1.4 2001/02/09 02:05:38 xorgcvs Exp $
*
*
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
* *
* Author: Jim Fulton, MIT X Consortium
*/
/* $XFree86: xc/programs/xauth/xauth.h,v 1.6 2001/12/14 20:01:15 dawes Exp $ */
#include <stdio.h>
#include <nx-X11/Xos.h>
#include <nx-X11/Xauth.h>
#include <nx-X11/Xfuncs.h>
#ifndef True
typedef int Bool;
#define False 0
#define True 1
#endif
extern char *ProgramName;
#include <stdlib.h>
extern char *get_hostname ( Xauth *auth );
extern char *get_address_info ( int family, char *fulldpyname, int prefix, char *host, int *lenp );
extern char *copystring ( char *src, int len );
extern char *get_local_hostname ( char *buf, int maxlen );
extern Bool parse_displayname ( char *displayname, int *familyp, char **hostp, int *dpynump, int *scrnump, char **restp );
extern int auth_initialize ( char *authfilename );
extern int auth_finalize ( void );
extern int process_command ( char *inputfilename, int lineno, int argc, char **argv );
extern int dump_numeric ( FILE *fp, Xauth *auth );
extern int print_help ( FILE *fp, char *cmd, char *prefix );
extern int verbose;
extern Bool ignore_locks;
extern Bool break_locks;
nx-libs.spec
View file @ 2f19f2f6
......@@ -155,50 +155,10 @@ This package contains all necessary include files and libraries
needed to develop applications that require these.
%package -n libNX_Xau-devel
Group: Development/Libraries
Summary: Development files for the NX authorization protocol library
Requires: libNX_Xau6%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
%description -n libNX_Xau-devel
NX is a software suite which implements very efficient compression of
the X11 protocol. This increases performance when using X
applications over a network, especially a slow one.
libNX_Xau provides mechanisms for individual access to an nx-X11 Window
System display. It uses existing core protocol and library hooks for
specifying authorization data in the connection setup block to restrict
use of the display to only those clients that show that they know a
server-specific key called a "magic cookie".
This package contains all necessary include files and libraries
needed to develop applications that require these.
%package -n libNX_Xau6
Group: System Environment/Libraries
Summary: NX authorization protocol library
Requires: %{name}%{?_isa} >= 3.5.0.29
Obsoletes: libNX_Xau
%description -n libNX_Xau6
NX is a software suite which implements very efficient compression of
the X11 protocol. This increases performance when using X
applications over a network, especially a slow one.
libNX_Xau provides mechanisms for individual access to an X Window
System display. It uses existing core protocol and library hooks for
specifying authorization data in the connection setup block to
restrict use of the display to only those clients that show that they
know a server-specific key called a "magic cookie".
%package -n libNX_Xext-devel
Group: Development/Libraries
Summary: Development files for the NX Common Extensions library
Requires: libNX_Xext6%{?_isa} = %{version}-%{release}
Requires: libNX_Xau6-devel%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
%description -n libNX_Xext-devel
......@@ -333,7 +293,6 @@ This package provides the session shadowing library.
Group: Development/Libraries
Summary: Include files and libraries for NX development
Requires: libNX_X11-devel%{?_isa} = %{version}-%{release}
Requires: libNX_Xau-devel%{?_isa} = %{version}-%{release}
Requires: libNX_Xext-devel%{?_isa} = %{version}-%{release}
Requires: nx-proto-devel%{?_isa} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
......@@ -391,18 +350,6 @@ related requests locally, ensuring that the most common source of
round-trips are nearly reduced to zero.
%package -n nxauth
Group: Applications/System
Summary: NX Auth
%description -n nxauth
NX is a software suite which implements very efficient compression of
the X11 protocol. This increases performance when using X
applications over a network, especially a slow one.
This package provides the NX xauth binary.
%package -n nxproxy
Group: Applications/System
Summary: NX Proxy
......@@ -489,14 +436,12 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%post -p /sbin/ldconfig
%post -n libNX_X11-6 -p /sbin/ldconfig
%post -n libNX_Xau6 -p /sbin/ldconfig
%post -n libNX_Xext6 -p /sbin/ldconfig
%post -n libXcomp3 -p /sbin/ldconfig
%post -n libXcompext3 -p /sbin/ldconfig
%post -n libXcompshad3 -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%postun -n libNX_X11-6 -p /sbin/ldconfig
%postun -n libNX_Xau6 -p /sbin/ldconfig
%postun -n libNX_Xext6 -p /sbin/ldconfig
%postun -n libXcomp3 -p /sbin/ldconfig
%postun -n libXcompext3 -p /sbin/ldconfig
......@@ -531,15 +476,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%{_includedir}/nx-X11/Xutil.h
%{_includedir}/nx-X11/cursorfont.h
%files -n libNX_Xau-devel
%defattr(-,root,root)
%{_libdir}/libNX_Xau.so
%{_includedir}/nx-X11/Xauth.h
%files -n libNX_Xau6
%defattr(-,root,root)
%{_libdir}/libNX_Xau.so.6*
%files -n libNX_Xext-devel
%defattr(-,root,root)
%{_libdir}/libNX_Xext.so
......@@ -669,13 +605,6 @@ rm -r %{buildroot}%{_includedir}/nx-X11/Xtrans
%{_datadir}/nx/rgb
%{_datadir}/man/man1/nxagent.1*
%files -n nxauth
%defattr(-,root,root)
%{_bindir}/nxauth
%dir %{_libdir}/nx/bin
%{_libdir}/nx/bin/nxauth
%{_datadir}/man/man1/nxauth.1*
%files -n nxproxy
%defattr(-,root,root)
%{_bindir}/nxproxy
......
roll-tarballs.sh
View file @ 2f19f2f6
......@@ -100,7 +100,7 @@ if [ "x$MODE" = "xfull" ]; then
echo "${file##*/}" >> "doc/applied-patches/series"
done
else
rm -f "bin/"{nxagent,nxauth}
rm -f "bin/nxagent"
rm -Rf "nxcompshad"*
rm -Rf "nxcompext"*
rm -Rf "nx-X11"*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment