Skip to content
GitLab
Commit 14d4ba7d authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Revert "Fixes: #941 DNS record : SRV type is properly useable in dns plugin" 

This reverts commit d952a37a.
parent d952a37a
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving 6388-clear-the-tokens-storage-issues-into-the-fusiondirectory-configuration-backend core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1 fusiondirectory-1.0.20 fusiondirectory-1.0.19 fusiondirectory-1.0.18 fusiondirectory-1.0.17 fusiondirectory-1.0.16 fusiondirectory-1.0.15 fusiondirectory-1.0.14 fusiondirectory-1.0.13 fusiondirectory-1.0.12 fusiondirectory-1.0.11 fusiondirectory-1.0.10 fusiondirectory-1.0.9.3 fusiondirectory-1.0.9.2 fusiondirectory-1.0.9.1 fusiondirectory-1.0.9 fusiondirectory-1.0.8.9 fusiondirectory-1.0.8.8 fusiondirectory-1.0.8.7 fusiondirectory-1.0.8.6 fusiondirectory-1.0.8.5 fusiondirectory-1.0.8.4 fusiondirectory-1.0.8.3 fusiondirectory-1.0.8.2 fusiondirectory-1.0.8.1 fusiondirectory-1.0.8 fusiondirectory-1.0.7.5 fusiondirectory-1.0.7.4 fusiondirectory-1.0.7.3 fusiondirectory-1.0.7.2 fusiondirectory-1.0.7.1 fusiondirectory-1.0.7 fusiondirectory-1.0.6 fusiondirectory-1.0.5 fusiondirectory-1.0.4 fusiondirectory-1.0.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 70 deletions
+9 -70
contrib/bin/fusiondirectory-setup
+ 1
− 26
View file @ 14d4ba7d
...@@ -859,14 +859,6 @@ This option will install the plugin from a tar.gz of the plugin. This option is ...@@ -859,14 +859,6 @@ This option will install the plugin from a tar.gz of the plugin. This option is
This option will change the path for fusiondirectory installation. it is only usefull with other commands and for people installing from sources. This option will change the path for fusiondirectory installation. it is only usefull with other commands and for people installing from sources.
=item --list_vars
This option will list the variables you can change to install FusionDirectory on another set of directories. This option is intended for people wanting to install from the sources.
=item --set-VAR=variable
This option will change the variable for the FusionDirectory installation. it is only usefull with --install-directories and for people installing from sources.
=item --yes =item --yes
This flag will answer "yes" to every yes/no question asked by the script This flag will answer "yes" to every yes/no question asked by the script
...@@ -878,26 +870,9 @@ This flag will answer "yes" to every yes/no question asked by the script ...@@ -878,26 +870,9 @@ This flag will answer "yes" to every yes/no question asked by the script
benoit@catbert$ fusiondirectory-setup --update-cache --update-locales benoit@catbert$ fusiondirectory-setup --update-cache --update-locales
Update FusionDirectory class cache and update localization Update FusionDirectory class cache and update localization
benoit@catbert$ fusiondirectory-setup --list-vars =head1 AUTHOR
List possible vars to give --set
locale_cache_dir [locale]
config_file [fusiondirectory.conf]
fd_cache [/var/cache/fusiondirectory]
fd_spool_dir [/var/spool/fusiondirectory]
fai_log_dir [fai]
tmp_dir [tmp]
template_dir [template]
locale_dir [locale]
fd_config_dir [/etc/fusiondirectory]
class_cache [class.cache]
fd_home [/usr/share/fusiondirectory]
benoit@catbert$ fusiondirectory-setup --install-directories --set-class_cache=class.cache
=head1 AUTHORS
Benjamin Carpentier Benjamin Carpentier
Côme Bernigaud
=head1 LICENCE AND COPYRIGHT =head1 LICENCE AND COPYRIGHT
......
contrib/man/fusiondirectory-setup.1
+ 4
− 33
View file @ 14d4ba7d
.\" Automatically generated by Pod::Man 2.22 (Pod::Simple 3.14) .\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.07)
.\" .\"
.\" Standard preamble: .\" Standard preamble:
.\" ======================================================================== .\" ========================================================================
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
.\" ======================================================================== .\" ========================================================================
.\" .\"
.IX Title "FUSIONDIRECTORY-SETUP 1" .IX Title "FUSIONDIRECTORY-SETUP 1"
.TH FUSIONDIRECTORY-SETUP 1 "2012-05-16" "Argonaut 1.0" "Argonaut Documentation" .TH FUSIONDIRECTORY-SETUP 1 "2012-01-31" "FusionDirectory 1.0" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents. .\" way too many mistakes in technical documents.
.if n .ad l .if n .ad l
...@@ -147,30 +147,18 @@ Needs \fImsgcat\fR and \fImsgfmt\fR to be installed. ...@@ -147,30 +147,18 @@ Needs \fImsgcat\fR and \fImsgfmt\fR to be installed.
.IP "\-\-check\-directories" 4 .IP "\-\-check\-directories" 4
.IX Item "--check-directories" .IX Item "--check-directories"
This option perform a check on all FusionDirectory's files or directories. This option perform a check on all FusionDirectory's files or directories.
.IP "\-\-check\-config" 4
.IX Item "--check-config"
This option perform a check on FusionDirectory's config file.
.IP "\-\-check\-ldap" 4 .IP "\-\-check\-ldap" 4
.IX Item "--check-ldap" .IX Item "--check-ldap"
This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do. This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do.
.IP "\-\-migrate\-repositories" 4 .IP "\-\-migrate\-repositories" 4
.IX Item "--migrate-repositories" .IX Item "--migrate-repositories"
This option check the fairepository object in your ldap tree and add the new option for FusionDirectory 1.0.2. This option check the fairepository object in your ldap tree and add the new option for FusionDirectory 1.0.2.
.IP "\-\-migrate\-users" 4
.IX Item "--migrate-users"
This option add FusionDirectory attributes to the people branch.
.IP "\-\-install\-plugins" 4 .IP "\-\-install\-plugins" 4
.IX Item "--install-plugins" .IX Item "--install-plugins"
This option will install the plugin from a tar.gz of the plugin. This option is intended for people wanting to install from the sources. This option will install the plugin from a tar.gz of the plugin. This option is intended for people wanting to install from the sources.
.IP "\-\-install\-directories" 4 .IP "\-\-install\-directories" 4
.IX Item "--install-directories" .IX Item "--install-directories"
This option will change the path for fusiondirectory installation. it is only usefull with other commands and for people installing from sources. This option will change the path for fusiondirectory installation. it is only usefull with other commands and for people installing from sources.
.IP "\-\-list_vars" 4
.IX Item "--list_vars"
This option will list the variables you can change to install FusionDirectory on another set of directories. This option is intended for people wanting to install from the sources.
.IP "\-\-set\-VAR=variable" 4
.IX Item "--set-VAR=variable"
This option will change the variable for the FusionDirectory installation. it is only usefull with \-\-install\-directories and for people installing from sources.
.IP "\-\-yes" 4 .IP "\-\-yes" 4
.IX Item "--yes" .IX Item "--yes"
This flag will answer \*(L"yes\*(R" to every yes/no question asked by the script This flag will answer \*(L"yes\*(R" to every yes/no question asked by the script
...@@ -179,27 +167,10 @@ This flag will answer \*(L"yes\*(R" to every yes/no question asked by the script ...@@ -179,27 +167,10 @@ This flag will answer \*(L"yes\*(R" to every yes/no question asked by the script
.Vb 2 .Vb 2
\& benoit@catbert$ fusiondirectory\-setup \-\-update\-cache \-\-update\-locales \& benoit@catbert$ fusiondirectory\-setup \-\-update\-cache \-\-update\-locales
\& Update FusionDirectory class cache and update localization \& Update FusionDirectory class cache and update localization
\&
\& benoit@catbert$ fusiondirectory\-setup \-\-list\-vars
\& List possible vars to give \-\-set
\& locale_cache_dir [locale]
\& config_file [fusiondirectory.conf]
\& fd_cache [/var/cache/fusiondirectory]
\& fd_spool_dir [/var/spool/fusiondirectory]
\& fai_log_dir [fai]
\& tmp_dir [tmp]
\& template_dir [template]
\& locale_dir [locale]
\& fd_config_dir [/etc/fusiondirectory]
\& class_cache [class.cache]
\& fd_home [/usr/share/fusiondirectory]
\&
\& benoit@catbert$ fusiondirectory\-setup \-\-install\-directories \-\-set\-class_cache=class.cache
.Ve .Ve
.SH "AUTHORS" .SH "AUTHOR"
.IX Header "AUTHORS" .IX Header "AUTHOR"
Benjamin Carpentier Benjamin Carpentier
CA\*~Xme Bernigaud
.SH "LICENCE AND COPYRIGHT" .SH "LICENCE AND COPYRIGHT"
.IX Header "LICENCE AND COPYRIGHT" .IX Header "LICENCE AND COPYRIGHT"
This code is part of FusionDirectory (http://www.fusiondirectory.org/) This code is part of FusionDirectory (http://www.fusiondirectory.org/)
......
include/class_tests.inc
+ 4
− 11
View file @ 14d4ba7d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* *
* The functions need to be handled with care, because they are not as strict * The functions need to be handled with care, because they are not as strict
* as one might expect. * as one might expect.
*/ */
class tests { class tests {
/*! \brief Test if the given string is a phone number */ /*! \brief Test if the given string is a phone number */
...@@ -46,15 +46,8 @@ class tests { ...@@ -46,15 +46,8 @@ class tests {
} }
/*! \brief Test if the given string contains characters allowed in a DNS record name */ /*! \brief Test if the given string contains characters allowed in a DNS name */
public static function is_dns_name($str) public static function is_dns_name($str)
{
return(preg_match("/^[a-z0-9\.\-_]*$/i",$str));
}
/*! \brief Test if the given string contains characters allowed in a hostname */
public static function is_valid_hostname($str)
{ {
return(preg_match("/^[a-z0-9\.\-]*$/i",$str)); return(preg_match("/^[a-z0-9\.\-]*$/i",$str));
} }
...@@ -130,7 +123,7 @@ class tests { ...@@ -130,7 +123,7 @@ class tests {
} }
/*! \brief Checks if the given ip address dosen't match /*! \brief Checks if the given ip address dosen't match
"is_ip" because there is also a sub net mask given */ "is_ip" because there is also a sub net mask given */
public static function is_ip_with_subnetmask($ip) public static function is_ip_with_subnetmask($ip)
{ {
...@@ -246,7 +239,7 @@ class tests { ...@@ -246,7 +239,7 @@ class tests {
/* \brief Check if $ip1 and $ip2 represents a valid IP range /* \brief Check if $ip1 and $ip2 represents a valid IP range
* \return TRUE in case of a valid range, FALSE in case of an error. * \return TRUE in case of a valid range, FALSE in case of an error.
*/ */
public static function is_ip_range($ip1,$ip2) public static function is_ip_range($ip1,$ip2)
{ {
......
Supports Markdown
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