Attachment #100909 for bug #135818

Lines 115-121 Link Here

(-)kdelibs-3.5.5.orig/kdecore/Makefile.am (-1 / +1 lines)
115	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \	115	kuser.cpp kconfigskeleton.cpp kconfigdialogmanager.cpp klockfile.cpp \
116	kqiodevicegzip_p.cpp ktimezones.cpp	116	kqiodevicegzip_p.cpp ktimezones.cpp
117		117
118	libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined	118	libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
119	libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la	119	libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
120	libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck	120	libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
121	libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \	121	libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \

Lines 784-790 Link Here

(-)kdelibs-3.5.5.orig/kdecore/Makefile.in (-1 / +1 lines)
784		784
785	#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined	785	#>- libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
786	#>+ 1	786	#>+ 1
787	libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)	787	libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(LIBUTEMPTER) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
788	libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la	788	libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
789	libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck	789	libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
790	libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \	790	libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \




# include <utmp.h>
#endif

#ifdef HAVE_UTEMPTER
# include <utempter.h>
#endif

#ifdef HAVE_TERMIOS_H
/* for HP-UX (some versions) the extern C is needed, and for other
   platforms it doesn't hurt */

// private functions //
///////////////////////

#ifdef HAVE_UTEMPTER
class KProcess_Utmp : public KProcess
{
public:
   int commSetupDoneC()
   {
     dup2(cmdFd, 0);
     dup2(cmdFd, 1);
     dup2(cmdFd, 3);
     return 1;
   }
   int cmdFd;
};
#endif

#define BASE_CHOWN "kgrantpty"



void KPty::login(const char *user, const char *remotehost)
{
#ifdef HAVE_UTEMPTER
    addToUtmp (d->ttyName, remotehost, d->masterFd);
    utmp.cmdFd = d->masterFd;
    utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << "";
    utmp.start(KProcess::Block);
    Q_UNUSED(user);
    Q_UNUSED(remotehost);
#elif defined(USE_LOGIN)
    const char *str_ptr;
    struct utmp l_struct;

void KPty::logout()
{
#ifdef HAVE_UTEMPTER
    removeLineFromUtmp(d->ttyName, d->masterFd);
    utmp.cmdFd = d->masterFd;
    utmp << "/usr/sbin/utempter" << "-d" << d->ttyName;
    utmp.start(KProcess::Block);
#elif defined(USE_LOGIN)
    const char *str_ptr = d->ttyName.data();
    if (!memcmp(str_ptr, "/dev/", 5))

Return to bug 135818

Lines 80-85 Link Here

(-)kdelibs-3.5.5.orig/kdecore/kpty.cpp (-24 / +6 lines)
80	# include <utmp.h>	80	# include <utmp.h>
81	#endif	81	#endif
82		82
		83	#ifdef HAVE_UTEMPTER
		84	# include <utempter.h>
		85	#endif
		86
83	#ifdef HAVE_TERMIOS_H	87	#ifdef HAVE_TERMIOS_H
84	/* for HP-UX (some versions) the extern C is needed, and for other	88	/* for HP-UX (some versions) the extern C is needed, and for other
85	platforms it doesn't hurt */	89	platforms it doesn't hurt */
Lines 138-158 Link Here
138	// private functions //	142	// private functions //
139	///////////////////////	143	///////////////////////
140		144
141	#ifdef HAVE_UTEMPTER
142	class KProcess_Utmp : public KProcess
143	{
144	public:
145	int commSetupDoneC()
146	{
147	dup2(cmdFd, 0);
148	dup2(cmdFd, 1);
149	dup2(cmdFd, 3);
150	return 1;
151	}
152	int cmdFd;
153	};
154	#endif
155
156	#define BASE_CHOWN "kgrantpty"	145	#define BASE_CHOWN "kgrantpty"
157		146
158		147
Lines 399-410 Link Here
399	void KPty::login(const char user, const char remotehost)	388	void KPty::login(const char user, const char remotehost)
400	{	389	{
401	#ifdef HAVE_UTEMPTER	390	#ifdef HAVE_UTEMPTER
402	KProcess_Utmp utmp;	391	addToUtmp (d->ttyName, remotehost, d->masterFd);
403	utmp.cmdFd = d->masterFd;
404	utmp << "/usr/sbin/utempter" << "-a" << d->ttyName << "";
405	utmp.start(KProcess::Block);
406	Q_UNUSED(user);	392	Q_UNUSED(user);
407	Q_UNUSED(remotehost);
408	#elif defined(USE_LOGIN)	393	#elif defined(USE_LOGIN)
409	const char *str_ptr;	394	const char *str_ptr;
410	struct utmp l_struct;	395	struct utmp l_struct;
Lines 442-451 Link Here
442	void KPty::logout()	427	void KPty::logout()
443	{	428	{
444	#ifdef HAVE_UTEMPTER	429	#ifdef HAVE_UTEMPTER
445	KProcess_Utmp utmp;	430	removeLineFromUtmp(d->ttyName, d->masterFd);
446	utmp.cmdFd = d->masterFd;
447	utmp << "/usr/sbin/utempter" << "-d" << d->ttyName;
448	utmp.start(KProcess::Block);
449	#elif defined(USE_LOGIN)	431	#elif defined(USE_LOGIN)
450	const char *str_ptr = d->ttyName.data();	432	const char *str_ptr = d->ttyName.data();
451	if (!memcmp(str_ptr, "/dev/", 5))	433	if (!memcmp(str_ptr, "/dev/", 5))