Attachment #1647 for bug #1707

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1707
Collapse All | Expand All

Lines 439-445 Link Here

(-)tdebase/kdesktop/minicli.cpp (-2 / +2 lines)
439	if (!kapp->authorize("shell_access"))	439	if (!kapp->authorize("shell_access"))
440	useTerminal = false;	440	useTerminal = false;
441		441
442	if( needsKDEsu() )	442	if( needsTDEsu() )
443	{	443	{
444	TQCString user;	444	TQCString user;
445	struct passwd *pw;	445	struct passwd *pw;
Lines 983-989 Link Here
983	updateAuthLabel();	983	updateAuthLabel();
984	}	984	}
985		985
986	bool Minicli::needsKDEsu()	986	bool Minicli::needsTDEsu()
987	{	987	{
988	return ((m_dlg->cbPriority->isChecked() && ((m_iPriority > 50) \|\|	988	return ((m_dlg->cbPriority->isChecked() && ((m_iPriority > 50) \|\|
989	(m_iScheduler != StubProcess::SchedNormal))) \|\|	989	(m_iScheduler != StubProcess::SchedNormal))) \|\|

Lines 69-75 Link Here

(-)tdebase/kdesktop/minicli.h (-1 / +1 lines)
69		69
70	protected:	70	protected:
71	void loadConfig();	71	void loadConfig();
72	bool needsKDEsu();	72	bool needsTDEsu();
73	virtual void keyPressEvent( TQKeyEvent* );	73	virtual void keyPressEvent( TQKeyEvent* );
74	virtual void fontChange( const TQFont & );	74	virtual void fontChange( const TQFont & );
75		75




#include <tdesu/su.h>
#include "sudlg.h"

TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
     : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
{
    TDEConfig* config = TDEGlobal::config();

}


TDEsuDialog::~TDEsuDialog()
{
}

bool TDEsuDialog::checkPassword(const char *password)
{
    SuProcess proc;
    proc.setUser(m_User);

    }
}

void TDEsuDialog::slotUser1()
{
    done(AsUser);
}





#include <kpassdlg.h>

class TDEsuDialog
    : public KPasswordDialog
{
    Q_OBJECT

public:
    TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
    ~TDEsuDialog();

    enum ResultCodes { AsUser = 10 };
    




    // Stop daemon and exit?
    if (args->isSet("s"))
    {
        TDEsuClient client;
        if (client.ping() == -1)
        {
            kdError(1206) << "Daemon not running -- nothing to stop\n";

    // Check for daemon and start if necessary
    bool just_started = false;
    bool have_daemon = true;
    TDEsuClient client;
    if (!client.isServerSGID())
    {
        kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";

        TDEStartupInfoData data;
        data.setSilent( TDEStartupInfoData::Yes );
        TDEStartupInfo::sendChange( id, data );
        TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);
	if (prompt)
	    dlg.addLine(i18n("Command:"), command);
        if ((priority != 50) || (scheduler != SuProcess::SchedNormal))

		dlg.addLine(i18n("Priority:"), prio);
        }
        int ret = dlg.exec();
        if (ret == TDEsuDialog::Rejected)
        {
            TDEStartupInfo::sendFinish( id );
            exit(0);
        }
        if (ret == TDEsuDialog::AsUser)
            change_uid = false;
        password = dlg.password();
        keep = dlg.keep();

Lines 180-186 Link Here

(-)tdebase/tdesu/tdesud/tdesud.cpp (-1 / +1 lines)
180		180
181	if (!access(sock, R_OK\|W_OK))	181	if (!access(sock, R_OK\|W_OK))
182	{	182	{
183	KDEsuClient client;	183	TDEsuClient client;
184	if (client.ping() == -1)	184	if (client.ping() == -1)
185	{	185	{
186	kdWarning(1205) << "stale socket exists\n";	186	kdWarning(1205) << "stale socket exists\n";

Return to bug 1707

Lines 14-20 Link Here

(-)tdebase/tdesu/tdesu/sudlg.cpp (-4 / +4 lines)
14	#include <tdesu/su.h>	14	#include <tdesu/su.h>
15	#include "sudlg.h"	15	#include "sudlg.h"
16		16
17	KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)	17	TDEsuDialog::TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton, int timeout)
18	: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)	18	: KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon)
19	{	19	{
20	TDEConfig* config = TDEGlobal::config();	20	TDEConfig* config = TDEGlobal::config();
Lines 50-60 Link Here
50	}	50	}
51		51
52		52
53	KDEsuDialog::~KDEsuDialog()	53	TDEsuDialog::~TDEsuDialog()
54	{	54	{
55	}	55	}
56		56
57	bool KDEsuDialog::checkPassword(const char *password)	57	bool TDEsuDialog::checkPassword(const char *password)
58	{	58	{
59	SuProcess proc;	59	SuProcess proc;
60	proc.setUser(m_User);	60	proc.setUser(m_User);
Lines 96-102 Link Here
96	}	96	}
97	}	97	}
98		98
99	void KDEsuDialog::slotUser1()	99	void TDEsuDialog::slotUser1()
100	{	100	{
101	done(AsUser);	101	done(AsUser);
102	}	102	}

Lines 141-147 Link Here

(-)tdebase/tdesu/tdesu/tdesu.cpp (-5 / +5 lines)
141	// Stop daemon and exit?	141	// Stop daemon and exit?
142	if (args->isSet("s"))	142	if (args->isSet("s"))
143	{	143	{
144	KDEsuClient client;	144	TDEsuClient client;
145	if (client.ping() == -1)	145	if (client.ping() == -1)
146	{	146	{
147	kdError(1206) << "Daemon not running -- nothing to stop\n";	147	kdError(1206) << "Daemon not running -- nothing to stop\n";
Lines 248-254 Link Here
248	// Check for daemon and start if necessary	248	// Check for daemon and start if necessary
249	bool just_started = false;	249	bool just_started = false;
250	bool have_daemon = true;	250	bool have_daemon = true;
251	KDEsuClient client;	251	TDEsuClient client;
252	if (!client.isServerSGID())	252	if (!client.isServerSGID())
253	{	253	{
254	kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";	254	kdWarning(1206) << "Daemon not safe (not sgid), not using it.\n";
Lines 352-358 Link Here
352	TDEStartupInfoData data;	352	TDEStartupInfoData data;
353	data.setSilent( TDEStartupInfoData::Yes );	353	data.setSilent( TDEStartupInfoData::Yes );
354	TDEStartupInfo::sendChange( id, data );	354	TDEStartupInfo::sendChange( id, data );
355	KDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);	355	TDEsuDialog dlg(user, auth_user, keep && !terminal,icon, withIgnoreButton, timeout);
356	if (prompt)	356	if (prompt)
357	dlg.addLine(i18n("Command:"), command);	357	dlg.addLine(i18n("Command:"), command);
358	if ((priority != 50) \|\| (scheduler != SuProcess::SchedNormal))	358	if ((priority != 50) \|\| (scheduler != SuProcess::SchedNormal))
Lines 365-376 Link Here
365	dlg.addLine(i18n("Priority:"), prio);	365	dlg.addLine(i18n("Priority:"), prio);
366	}	366	}
367	int ret = dlg.exec();	367	int ret = dlg.exec();
368	if (ret == KDEsuDialog::Rejected)	368	if (ret == TDEsuDialog::Rejected)
369	{	369	{
370	TDEStartupInfo::sendFinish( id );	370	TDEStartupInfo::sendFinish( id );
371	exit(0);	371	exit(0);
372	}	372	}
373	if (ret == KDEsuDialog::AsUser)	373	if (ret == TDEsuDialog::AsUser)
374	change_uid = false;	374	change_uid = false;
375	password = dlg.password();	375	password = dlg.password();
376	keep = dlg.keep();	376	keep = dlg.keep();

Lines 9-22 Link Here

(-)tdebase/tdesu/tdesu/sudlg.h (-3 / +3 lines)
9		9
10	#include <kpassdlg.h>	10	#include <kpassdlg.h>
11		11
12	class KDEsuDialog	12	class TDEsuDialog
13	: public KPasswordDialog	13	: public KPasswordDialog
14	{	14	{
15	Q_OBJECT	15	Q_OBJECT
16		16
17	public:	17	public:
18	KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);	18	TDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep, const TQString& icon , bool withIgnoreButton=false, int timeout=-1);
19	~KDEsuDialog();	19	~TDEsuDialog();
20		20
21	enum ResultCodes { AsUser = 10 };	21	enum ResultCodes { AsUser = 10 };
22		22