Changeset 16544


Ignore:
Timestamp:
Aug 18, 2016, 8:57:32 PM (3 years ago)
Author:
dcorreia
Message:

Updated editing of common-auth pam file.
Updated exception to detect checksystem errors.

Location:
internals/2016/linuxloginsmartcardwizard/trunk/proto1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/checksystem.py

    r16540 r16544  
    1818       
    1919        self.layoutWidget1 = QtWidgets.QWidget(self)
    20         self.layoutWidget1.setGeometry(QtCore.QRect(40, 40, 300, 200))
     20        self.layoutWidget1.setGeometry(QtCore.QRect(40, 40, 400, 200))
    2121        self.layoutWidget1.setObjectName("layoutWidget1")
    2222        self.systemVLayout = QtWidgets.QVBoxLayout(self.layoutWidget1)
     
    7373            self.systemErrorLabel.setText("Failed to install necessary packages.\n\n"
    7474                                          "Failed to create configuration directories.\n\n"
    75                                           "Please use the manual to check if you have admin permissions.\n\n")
     75                                          "Please use the manual to check if you have root permissions.\n\n")
    7676
    7777    def isComplete(self):
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/config.py

    r16539 r16544  
    234234
    235235
     236def getCommonAuthStart(listData):
     237    for index in range(0, len(listData)):
     238        if "auth" == listData[index][:4]:
     239            return index
     240
     241
    236242def runPamAuthUpdate(mode="enable"):
    237243    """
     
    241247    authData = fileHelper.readFileToList(COMMONAUTH)
    242248    pkcs11Index = getIndexOfToken("pam_pkcs11.so", authData)
    243     unixIndex = getIndexOfToken("pam_unix.so", authData)
     249    unixIndex = getCommonAuthStart(authData)
    244250
    245251    if pkcs11Index is None and mode == "enable":
  • internals/2016/linuxloginsmartcardwizard/trunk/proto1/fileHelper.py

    r16539 r16544  
    8282        printDebugInfo(error)
    8383        return False
     84    except PermissionError as error:
     85        printDebugInfo(error)
     86        return False
    8487
    8588
Note: See TracChangeset for help on using the changeset viewer.