author | erik <erik> | 2007-01-31 22:06:07 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-31 22:06:07 (UTC) |
commit | 9395cf2a65184e493714c699bb23b02ea31feef5 (patch) (unidiff) | |
tree | ea07c026298820559c13ad32e612d51048cee0a9 /noncore/settings/networksettings/ppp | |
parent | 958e042c5a4d4e38fd1baae50b78a2febfd306ab (diff) | |
download | opie-9395cf2a65184e493714c699bb23b02ea31feef5.zip opie-9395cf2a65184e493714c699bb23b02ea31feef5.tar.gz opie-9395cf2a65184e493714c699bb23b02ea31feef5.tar.bz2 |
I expanded my audit to include any app I could get to compile in i386.
In that expansion a whole new crop of unchecked returns has sprung up.
This commit fixes those weeds or should I say potential bugs.
Diffstat (limited to 'noncore/settings/networksettings/ppp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/modem.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/settings/networksettings/ppp/modem.cpp b/noncore/settings/networksettings/ppp/modem.cpp index 7b2e2a3..17ada9b 100644 --- a/noncore/settings/networksettings/ppp/modem.cpp +++ b/noncore/settings/networksettings/ppp/modem.cpp | |||
@@ -675,194 +675,196 @@ int Modem::openLockfile( QString lockfile, int flags) | |||
675 | // } | 675 | // } |
676 | if ((fd = open(lockfile, flags, mode)) == -1) { | 676 | if ((fd = open(lockfile, flags, mode)) == -1) { |
677 | odebug << "error opening lockfile!" << oendl; | 677 | odebug << "error opening lockfile!" << oendl; |
678 | lockfile = QString::null; | 678 | lockfile = QString::null; |
679 | fd = open(DEVNULL, O_RDONLY); | 679 | fd = open(DEVNULL, O_RDONLY); |
680 | } else | 680 | } else |
681 | fchown(fd, 0, 0); | 681 | fchown(fd, 0, 0); |
682 | return fd; | 682 | return fd; |
683 | } | 683 | } |
684 | 684 | ||
685 | 685 | ||
686 | 686 | ||
687 | void alarm_handler(int) { | 687 | void alarm_handler(int) { |
688 | // fprintf(stderr, "alarm_handler(): Received SIGALRM\n"); | 688 | // fprintf(stderr, "alarm_handler(): Received SIGALRM\n"); |
689 | 689 | ||
690 | // jump | 690 | // jump |
691 | siglongjmp(jmp_buffer, 1); | 691 | siglongjmp(jmp_buffer, 1); |
692 | } | 692 | } |
693 | 693 | ||
694 | 694 | ||
695 | const char* Modem::authFile(Auth method, int version) { | 695 | const char* Modem::authFile(Auth method, int version) { |
696 | switch(method|version) { | 696 | switch(method|version) { |
697 | case PAP|Original: | 697 | case PAP|Original: |
698 | return PAP_AUTH_FILE; | 698 | return PAP_AUTH_FILE; |
699 | break; | 699 | break; |
700 | case PAP|New: | 700 | case PAP|New: |
701 | return PAP_AUTH_FILE".new"; | 701 | return PAP_AUTH_FILE".new"; |
702 | break; | 702 | break; |
703 | case PAP|Old: | 703 | case PAP|Old: |
704 | return PAP_AUTH_FILE".old"; | 704 | return PAP_AUTH_FILE".old"; |
705 | break; | 705 | break; |
706 | case CHAP|Original: | 706 | case CHAP|Original: |
707 | return CHAP_AUTH_FILE; | 707 | return CHAP_AUTH_FILE; |
708 | break; | 708 | break; |
709 | case CHAP|New: | 709 | case CHAP|New: |
710 | return CHAP_AUTH_FILE".new"; | 710 | return CHAP_AUTH_FILE".new"; |
711 | break; | 711 | break; |
712 | case CHAP|Old: | 712 | case CHAP|Old: |
713 | return CHAP_AUTH_FILE".old"; | 713 | return CHAP_AUTH_FILE".old"; |
714 | break; | 714 | break; |
715 | default: | 715 | default: |
716 | return 0L; | 716 | return 0L; |
717 | } | 717 | } |
718 | } | 718 | } |
719 | 719 | ||
720 | 720 | ||
721 | bool Modem::createAuthFile(Auth method, const char *username, const char *password) { | 721 | bool Modem::createAuthFile(Auth method, const char *username, const char *password) { |
722 | const char *authfile, *oldName, *newName; | 722 | const char *authfile, *oldName, *newName; |
723 | char line[100]; | 723 | char line[100]; |
724 | char regexp[2*MaxStrLen+30]; | 724 | char regexp[2*MaxStrLen+30]; |
725 | regex_t preg; | 725 | regex_t preg; |
726 | 726 | ||
727 | if(!(authfile = authFile(method))) | 727 | if(!(authfile = authFile(method))) |
728 | return false; | 728 | return false; |
729 | 729 | ||
730 | if(!(newName = authFile(method, New))) | 730 | if(!(newName = authFile(method, New))) |
731 | return false; | 731 | return false; |
732 | 732 | ||
733 | // look for username, "username" or 'username' | 733 | // look for username, "username" or 'username' |
734 | // if you modify this RE you have to adapt regexp's size above | 734 | // if you modify this RE you have to adapt regexp's size above |
735 | snprintf(regexp, sizeof(regexp), "^[ \t]*%s[ \t]\\|^[ \t]*[\"\']%s[\"\']", | 735 | snprintf(regexp, sizeof(regexp), "^[ \t]*%s[ \t]\\|^[ \t]*[\"\']%s[\"\']", |
736 | username,username); | 736 | username,username); |
737 | MY_ASSERT(regcomp(&preg, regexp, 0) == 0); | 737 | MY_ASSERT(regcomp(&preg, regexp, 0) == 0); |
738 | 738 | ||
739 | // copy to new file pap- or chap-secrets | 739 | // copy to new file pap- or chap-secrets |
740 | int old_umask = umask(0077); | 740 | int old_umask = umask(0077); |
741 | FILE *fout = fopen(newName, "w"); | 741 | FILE *fout = fopen(newName, "w"); |
742 | if(fout) { | 742 | if(fout) { |
743 | // copy old file | 743 | // copy old file |
744 | FILE *fin = fopen(authfile, "r"); | 744 | FILE *fin = fopen(authfile, "r"); |
745 | if(fin) { | 745 | if(fin) { |
746 | while(fgets(line, sizeof(line), fin)) { | 746 | while(fgets(line, sizeof(line), fin)) { |
747 | if(regexec(&preg, line, 0, 0L, 0) == 0) | 747 | if(regexec(&preg, line, 0, 0L, 0) == 0) |
748 | continue; | 748 | continue; |
749 | fputs(line, fout); | 749 | fputs(line, fout); |
750 | } | 750 | } |
751 | fclose(fin); | 751 | fclose(fin); |
752 | } | 752 | } |
753 | 753 | ||
754 | // append user/pass pair | 754 | // append user/pass pair |
755 | fprintf(fout, "\"%s\"\t*\t\"%s\"\n", username, password); | 755 | fprintf(fout, "\"%s\"\t*\t\"%s\"\n", username, password); |
756 | fclose(fout); | 756 | fclose(fout); |
757 | } | 757 | } |
758 | 758 | ||
759 | // restore umask | 759 | // restore umask |
760 | umask(old_umask); | 760 | umask(old_umask); |
761 | 761 | ||
762 | // free memory allocated by regcomp | 762 | // free memory allocated by regcomp |
763 | regfree(&preg); | 763 | regfree(&preg); |
764 | 764 | ||
765 | if(!(oldName = authFile(method, Old))) | 765 | if(!(oldName = authFile(method, Old))) |
766 | return false; | 766 | return false; |
767 | 767 | ||
768 | // delete old file if any | 768 | // delete old file if any |
769 | unlink(oldName); | 769 | unlink(oldName); |
770 | 770 | ||
771 | rename(authfile, oldName); | 771 | if (rename(authfile, oldName) == -1) |
772 | rename(newName, authfile); | 772 | return false; |
773 | if (rename(newName, authfile) == -1) | ||
774 | return false; | ||
773 | 775 | ||
774 | return true; | 776 | return true; |
775 | } | 777 | } |
776 | 778 | ||
777 | 779 | ||
778 | bool Modem::removeAuthFile(Auth method) { | 780 | bool Modem::removeAuthFile(Auth method) { |
779 | const char *authfile, *oldName; | 781 | const char *authfile, *oldName; |
780 | 782 | ||
781 | if(!(authfile = authFile(method))) | 783 | if(!(authfile = authFile(method))) |
782 | return false; | 784 | return false; |
783 | if(!(oldName = authFile(method, Old))) | 785 | if(!(oldName = authFile(method, Old))) |
784 | return false; | 786 | return false; |
785 | 787 | ||
786 | if(access(oldName, F_OK) == 0) { | 788 | if(access(oldName, F_OK) == 0) { |
787 | unlink(authfile); | 789 | unlink(authfile); |
788 | return (rename(oldName, authfile) == 0); | 790 | return (rename(oldName, authfile) == 0); |
789 | } else | 791 | } else |
790 | return false; | 792 | return false; |
791 | } | 793 | } |
792 | 794 | ||
793 | 795 | ||
794 | bool Modem::setSecret(int method, const char* name, const char* password) | 796 | bool Modem::setSecret(int method, const char* name, const char* password) |
795 | { | 797 | { |
796 | 798 | ||
797 | Auth auth; | 799 | Auth auth; |
798 | if(method == AUTH_PAPCHAP) | 800 | if(method == AUTH_PAPCHAP) |
799 | return setSecret(AUTH_PAP, name, password) && | 801 | return setSecret(AUTH_PAP, name, password) && |
800 | setSecret(AUTH_CHAP, name, password); | 802 | setSecret(AUTH_CHAP, name, password); |
801 | 803 | ||
802 | switch(method) { | 804 | switch(method) { |
803 | case AUTH_PAP: | 805 | case AUTH_PAP: |
804 | auth = Modem::PAP; | 806 | auth = Modem::PAP; |
805 | break; | 807 | break; |
806 | case AUTH_CHAP: | 808 | case AUTH_CHAP: |
807 | auth = Modem::CHAP; | 809 | auth = Modem::CHAP; |
808 | break; | 810 | break; |
809 | default: | 811 | default: |
810 | return false; | 812 | return false; |
811 | } | 813 | } |
812 | 814 | ||
813 | return createAuthFile(auth, name, password); | 815 | return createAuthFile(auth, name, password); |
814 | 816 | ||
815 | } | 817 | } |
816 | 818 | ||
817 | bool Modem::removeSecret(int method) | 819 | bool Modem::removeSecret(int method) |
818 | { | 820 | { |
819 | Auth auth; | 821 | Auth auth; |
820 | 822 | ||
821 | switch(method) { | 823 | switch(method) { |
822 | case AUTH_PAP: | 824 | case AUTH_PAP: |
823 | auth = Modem::PAP; | 825 | auth = Modem::PAP; |
824 | break; | 826 | break; |
825 | case AUTH_CHAP: | 827 | case AUTH_CHAP: |
826 | auth = Modem::CHAP; | 828 | auth = Modem::CHAP; |
827 | break; | 829 | break; |
828 | default: | 830 | default: |
829 | return false; | 831 | return false; |
830 | } | 832 | } |
831 | return removeAuthFile( auth ); | 833 | return removeAuthFile( auth ); |
832 | } | 834 | } |
833 | 835 | ||
834 | int checkForInterface() | 836 | int checkForInterface() |
835 | { | 837 | { |
836 | // I don't know if Linux needs more initialization to get the ioctl to | 838 | // I don't know if Linux needs more initialization to get the ioctl to |
837 | // work, pppd seems to hint it does. But BSD doesn't, and the following | 839 | // work, pppd seems to hint it does. But BSD doesn't, and the following |
838 | // code should compile. | 840 | // code should compile. |
839 | #if (defined(HAVE_NET_IF_PPP_H) || defined(HAVE_LINUX_IF_PPP_H)) && !defined(__svr4__) | 841 | #if (defined(HAVE_NET_IF_PPP_H) || defined(HAVE_LINUX_IF_PPP_H)) && !defined(__svr4__) |
840 | int s, ok; | 842 | int s, ok; |
841 | struct ifreq ifr; | 843 | struct ifreq ifr; |
842 | // extern char *no_ppp_msg; | 844 | // extern char *no_ppp_msg; |
843 | 845 | ||
844 | if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) | 846 | if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) |
845 | return 1; /* can't tell */ | 847 | return 1; /* can't tell */ |
846 | 848 | ||
847 | strlcpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name)); | 849 | strlcpy(ifr.ifr_name, "ppp0", sizeof (ifr.ifr_name)); |
848 | ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0; | 850 | ok = ioctl(s, SIOCGIFFLAGS, (caddr_t) &ifr) >= 0; |
849 | close(s); | 851 | close(s); |
850 | 852 | ||
851 | if (ok == -1) { | 853 | if (ok == -1) { |
852 | // This is ifdef'd FreeBSD, because FreeBSD is the only BSD that supports | 854 | // This is ifdef'd FreeBSD, because FreeBSD is the only BSD that supports |
853 | // KLDs, the old LKM interface couldn't handle loading devices | 855 | // KLDs, the old LKM interface couldn't handle loading devices |
854 | // dynamically, and thus can't load ppp support on the fly | 856 | // dynamically, and thus can't load ppp support on the fly |
855 | #ifdef __FreeBSD__ | 857 | #ifdef __FreeBSD__ |
856 | // If we failed to load ppp support and don't have it already. | 858 | // If we failed to load ppp support and don't have it already. |
857 | if (kldload("if_ppp") == -1) { | 859 | if (kldload("if_ppp") == -1) { |
858 | return -1; | 860 | return -1; |
859 | } | 861 | } |
860 | return 0; | 862 | return 0; |
861 | #else | 863 | #else |
862 | return -1; | 864 | return -1; |
863 | #endif | 865 | #endif |
864 | } | 866 | } |
865 | return 0; | 867 | return 0; |
866 | #else | 868 | #else |
867 | // We attempt to use the SunOS/SysVr4 method and stat /dev/ppp | 869 | // We attempt to use the SunOS/SysVr4 method and stat /dev/ppp |
868 | struct stat buf; | 870 | struct stat buf; |