diff --git a/doc/AC-RFC.tex b/doc/AC-RFC.tex index 35fa6077..97ecdb7c 100644 --- a/doc/AC-RFC.tex +++ b/doc/AC-RFC.tex @@ -9,8 +9,8 @@ \section{Introduction} X.509 Attribute Certificates (ACs) \cite{rfc3281} are used to bind a set of attributes, like group membership, role, security clearance, etc\ldots\ with an AC holder. Their well-defined, standardized format -and easy extensibility make them a premium way to distribute those -informations in large system, and in particular in environments where +and easy extensibility make them a premium way to distribute that +information in large system, and in particular in environments where authentication is done via X.509 Certificates \cite{rfc3280}. This is the reason why ACs are the format chosen by the VOMS server \cite{voms} to encode authorization data. @@ -52,7 +52,7 @@ \section{FQAN} \end{enumerate} For these reasons, a new format has been devised, as documented in -\cite{fqan}. However, here follows a copy of the relevant informations. +\cite{fqan}. However, here follows a copy of the relevant information. Group membership, Role holding and Capabilities may be expressed in a format that bounds them together in the following way: @@ -175,7 +175,7 @@ \subsection{V2Form} particular means that this subject MUST NOT be empty. \section{Attributes} -The attributes field contains informations about the AC holder. At +The attributes field contains information about the AC holder. At least one attribute MUST always be present. Attributes types use the format defined in \cite{rfc3281}, repeated here @@ -194,7 +194,7 @@ \section{Attributes} The attributes Group and Role, defined in \cite{rfc3281} are not used by VOMS AC, and SHOULD NOT be present in conforming ACs. Instead, it -defines a new attribute, FQAN, which holds informations about both, +defines a new attribute, FQAN, which holds information about both, and in fact also binds them together. \begin{verbatim} diff --git a/doc/c++api.tex b/doc/c++api.tex index 38378a40..d3d3b7bc 100644 --- a/doc/c++api.tex +++ b/doc/c++api.tex @@ -29,7 +29,7 @@ \chapter{Introduction} \begin{compatibility} Some information \end{compatibility} -These section contain informations regarding both back and forward +These sections contain information regarding both back and forward compatibility between different versions of the API. \begin{compatibility} @@ -92,7 +92,7 @@ \subsection{cap} \section{The voms structure} The second one, \texttt{voms} is used to group together all the -informations that can be gleaned from a single AC, and is defined as +information that can be gleaned from a single AC, and is defined as follows: \begin{lstlisting}{} @@ -195,7 +195,7 @@ \subsection{uri} \subsection{date1, date2} These are the dates of start and end of validity of the rest of the -informations. They are in a string representation readable to humans, +information. They are in a string representation readable to humans, but they may be easily converted back to their original format, with a little twist: dates coming from an AC are in GeneralizedTime format, while dates coming from the old version data are in UtcTime format. @@ -266,7 +266,7 @@ \subsection{fqan} \section{vomsdata} The purpose of this object is to collect in a single place all -informations present in a VOMS extension. It is defined so. +information present in a VOMS extension. It is defined so. \begin{lstlisting}{} struct vomsdata { @@ -375,7 +375,7 @@ \subsection{error} \subsection{data} This field contains a vector of \texttt{voms} structures, in the exact same order as the corresponding ACs appeared in the proxy certificate, -and containing the informations present in that AC. +and containing the information present in that AC. \section{Methods} \subsection {voms} @@ -624,7 +624,7 @@ \subsection{bool vomsdata::Retrieve(X509 *cert, STACK\_OF(X509) *chain, recurse\ certificate, executes the verifications requested by the SetVerificationType() function and interprets the data. \parameter{cert}{This is the X509 proxy certificate from which we want to -retrieve the informations.} +retrieve the information.} \parameter{chain}{This is the certificate chain associated to the proxy certificate. This parameter is only significant if the value of the next parameter is \texttt{RECURSE\_CHAIN}.} diff --git a/doc/capi.tex b/doc/capi.tex index 33e52cec..8e29d48e 100644 --- a/doc/capi.tex +++ b/doc/capi.tex @@ -32,7 +32,7 @@ \chapter{Introduction} \begin{compatibility} Some information \end{compatibility} -These section contain informations regarding both back and forward +These sections contain information regarding both back and forward compatibility between different versions of the API. \begin{compatibility} @@ -95,7 +95,7 @@ \subsection{cap} \section{The voms structure} The second one, \verb|voms| is used to group together all the -informations that can be gleaned from a single AC, and is defined as +information that can be gleaned from a single AC, and is defined as follows: {\begin{lstlisting}{} @@ -185,7 +185,7 @@ \subsection{uri} \subsection{date1, date2} These are the dates of start and end of validity of the rest of the -informations. They are in a string representation readable to humans, +information. They are in a string representation readable to humans, but they may be easily converted back to their original format, with a little twist: dates coming from an AC are in GeneralizedTime format, while dates coming from the old version data are in UtcTime format. @@ -261,7 +261,7 @@ \subsection{fqan} \section{vomsdata} The purpose of this object is to collect in a single place all -informations present in a VOMS extension. All the fields should be +information present in a VOMS extension. All the fields should be considered read-only. Changing them has indefinite results. {\begin{lstlisting}{} @@ -282,7 +282,7 @@ \section{vomsdata} \subsection{data} This field contains a vector of \verb|voms| structures, in the exact same order as the corresponding ACs appeared in the proxy certificate, -and containing the informations present in that AC. +and containing the information present in that AC. \subsection{workvo, volen} \begin{compatibility} @@ -694,7 +694,7 @@ \subsection{int VOMS\_Contact(char *hostname, int port, char *servsubject, char *command, struct vomsdata *vd, int *error)} This function is used to contact a VOMS server to receive an AC -containing the calling user's authorization informations. A +containing the calling user's authorization information. A prerequisite to calling this function is the existance of a valid proxy for the user himself. This function does not create such a proxy, which then must already exist. Also, the parameters needed to diff --git a/doc/software.tex b/doc/software.tex index 84b2a6de..d2a70005 100644 --- a/doc/software.tex +++ b/doc/software.tex @@ -393,7 +393,7 @@ \section{Invocation} order in which these options are specified in the command line.\\ \textbf{--version} & Prints version information and exits.\\ -\textbf{--quiet} & Prints only minimal informations. +\textbf{--quiet} & Prints only minimal information. \emph{WARNING}: some vital warnings may get overlooked by this option.\\ \textbf{--verify} & Verifies the certificate from which to create the @@ -518,11 +518,11 @@ \section{Invocation} should be specified in the format ``option=value''.\\ \textbf{--debug} & This option prints a series of additional debug - informations on stdout. The additional output + information on stdout. The additional output returned by this option should \emph{always} be included into bug reports for the voms-proxy-init command. User should not, - however, ever rely on informations printed by + however, ever rely on information printed by this options. Both content and format are guaranteed to change between software releases.\\ @@ -532,7 +532,7 @@ \section{Invocation} \chapter{voms-proxy-info} \section{Introduction} -This command is used to print to the screen the informations included +This command is used to print to the screen the information included in an already generated VOMS proxy. \section{Configuration} @@ -541,11 +541,11 @@ \section{Configuration} \section{Invocation} \begin{longtable}{lp{3in}} \textbf{--debug} & This option prints a series of additional debug - informations on stdout. The additional output + information on stdout. The additional output returned by this option should \emph{always} be included into bug reports for the voms-proxy-info command. User should not, - however, ever rely on informations printed by + however, ever rely on information printed by this options. Both content and format are guaranteed to change between software releases.\\ @@ -571,7 +571,7 @@ \section{Invocation} \textbf{--info} & Lets ``--subject'', ``--issuer'', ``--valid'' and ``--time'' also apply to ACs, and prints attributes values.\\ -\textbf{--extra} & Prints extra informations that were included in +\textbf{--extra} & Prints extra information that were included in the proxy.\\ \textbf{--all} & Prints everything. (Implies all other options.)\\ @@ -601,11 +601,11 @@ \section{Invocation} \begin{longtable}{lp{3in}} \textbf{--debug} & This option prints a series of additional debug - informations on stdout. The additional output + information on stdout. The additional output returned by this option should \emph{always} be included into bug reports for the voms-proxy-info command. User should not, - however, ever rely on informations printed by + however, ever rely on information printed by this options. Both content and format are guaranteed to change between software releases.\\ @@ -615,7 +615,7 @@ \section{Invocation} option per line, and option that do have values should be specified in the format ``option=value''.\\ -\textbf{--quiet} & Prints only minimal informations. +\textbf{--quiet} & Prints only minimal information. \emph{WARNING}: some vital warnings may get overlooked by this option.\\ \textbf{--file} & This option lets you specify a non-standard diff --git a/doc/voms-proxy-fake.1 b/doc/voms-proxy-fake.1 index 1941b8f5..926bcd41 100644 --- a/doc/voms-proxy-fake.1 +++ b/doc/voms-proxy-fake.1 @@ -221,7 +221,7 @@ The created certificate will be a self\-signed certificate and have a CA=true bi \fB\-extension\fR \fIoid[/criticality]value\fR .PP -This option allows to specified additional extensions to be put in the created certificate\&. +This option allows one to specify additional extensions to be put in the created certificate\&. .PP \fIoid\fR is the Object Identifier of the extensions\&. Any OID may be used even if it is not already known in advance\&. This must always be specified\&. There is no default\&. @@ -239,7 +239,7 @@ is the value of the extensions\&. It is composed by two subfields, and \fIcontent\fR\&. \fItype\fR -is a single charater, and specifies how the +is a single character, and specifies how the \fIcontent\fR is interpreted\&. \*(Aq:\*(Aq means that \fIcontent\fR @@ -252,7 +252,7 @@ is the name of a file which will contain the actual data\&. \fB\-acextension\fR \fIoid[/criticality]value\fR .PP -This option allows to specified additional extensions to be put in the created attribute certificate\&. +This option allows one to specify additional extensions to be put in the created attribute certificate\&. .PP \fIoid\fR is the Object Identifier of the extensions\&. Any OID may be used even if it is not already known in advance\&. This must always be specified\&. There is no default\&. @@ -270,7 +270,7 @@ is the value of the extensions\&. It is composed by two subfields, and \fIcontent\fR\&. \fItype\fR -is a single charater, and specifies how the +is a single character, and specifies how the \fIcontent\fR is interpreted\&. \*(Aq:\*(Aq means that \fIcontent\fR @@ -293,7 +293,7 @@ This option adds the generic attribute specified to the AC generated\&. Please n .PP The file \fIfile\fR -contains informations for additional ACs that should be included in the created proxy\&. ACs specified via the \-voinfo option shall be added before ACs specified via the command line options\&. +contains information for additional ACs that should be included in the created proxy\&. ACs specified via the \-voinfo option shall be added before ACs specified via the command line options\&. .PP The format of the file is the following: .PP diff --git a/doc/voms-proxy-fake.xml b/doc/voms-proxy-fake.xml index c04932f2..d514bde4 100644 --- a/doc/voms-proxy-fake.xml +++ b/doc/voms-proxy-fake.xml @@ -194,7 +194,7 @@ of: seconds, hours:minutes oid[/criticality]value -This option allows to specified additional extensions to be put +This option allows one to specify additional extensions to be put in the created certificate. oid is the Object Identifier of the extensions. Any OID may be used even if it is not already known @@ -209,7 +209,7 @@ of: seconds, hours:minutestype and content. type - is a single charater, and specifies how + is a single character, and specifies how the content is interpreted. ':' means that content is a text string to be included as is. '~' means @@ -219,7 +219,7 @@ of: seconds, hours:minutes oid[/criticality]value -This option allows to specified additional extensions to be put +This option allows one to specify additional extensions to be put in the created attribute certificate. oid is the Object Identifier of the extensions. Any OID may be used even if it is not already known @@ -234,7 +234,7 @@ of: seconds, hours:minutestype and content. type - is a single charater, and specifies how + is a single character, and specifies how the content is interpreted. ':' means that content is a text string to be included as is. '~' means @@ -249,7 +249,7 @@ of: seconds, hours:minutes file -The file file contains informations for +The file file contains information for additional ACs that should be included in the created proxy. ACs specified via the -voinfo option shall be added before ACs specified via the command line options. diff --git a/doc/voms-proxy-info.1 b/doc/voms-proxy-info.1 index 467f5ad0..10b3b852 100644 --- a/doc/voms-proxy-info.1 +++ b/doc/voms-proxy-info.1 @@ -28,7 +28,7 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -voms-proxy-info \- prints informations about a proxy with VOMS extensions +voms-proxy-info \- prints information about a proxy with VOMS extensions .SH "SYNOPSIS" .HP \w'\fBvoms\-proxy\-info\fR\ 'u \fBvoms\-proxy\-info\fR [options] @@ -55,7 +55,7 @@ Enables extra debug output\&. This is for bug reports only\&. Users must not rel The name of the file containing the proxy, in case it is in a non\-standard place\&. .PP \fB\-chain\fR -Prints informations about the proxy\*(Aqs certificate chain\&. +Prints information about the proxy\*(Aqs certificate chain\&. .PP \fB\-subject\fR Prints the DN of the proxy\*(Aqs subject\&. diff --git a/doc/voms-proxy-info.xml b/doc/voms-proxy-info.xml index 339da721..0f4e7992 100644 --- a/doc/voms-proxy-info.xml +++ b/doc/voms-proxy-info.xml @@ -16,7 +16,7 @@ voms-proxy-info -prints informations about a proxy with VOMS extensions +prints information about a proxy with VOMS extensions @@ -56,7 +56,7 @@ The name of the file containing the proxy, in case it is in a non-standard place. -Prints informations about the proxy's certificate chain. +Prints information about the proxy's certificate chain. Prints the DN of the proxy's subject. diff --git a/doc/voms-proxy-init.1 b/doc/voms-proxy-init.1 index 5d9bd9ae..758ba597 100644 --- a/doc/voms-proxy-init.1 +++ b/doc/voms-proxy-init.1 @@ -106,7 +106,7 @@ Location of new proxy cert \fB\-voms\fR \fIvoms[:command]\fR Specifies the VOMS server to contact using the nickname -\fIvoms\fR\&. It also allows to send a specific command to the server\&. The default command is +\fIvoms\fR\&. It also allows one to send a specific command to the server\&. The default command is \fB:all\fR, and it gets all group membership information\&. Other commands are \fB:/Role=rolename\fR which grants the @@ -189,7 +189,7 @@ This option targets the generated AC to a specific host\&. This option may be sp .PP \fB\-timeout\fR \fIseconds\fR -This option allows to specify the maximum number of seconds that voms\-proxy\-init will wait while trying to establish a connection with the server\&. Its default value is \-1 (unlimited)\&. +This option allows one to specify the maximum number of seconds that voms\-proxy\-init will wait while trying to establish a connection with the server\&. Its default value is \-1 (unlimited)\&. .PP \fB\-noregen\fR Use existing proxy to contact the server and to sing the new proxy\&. diff --git a/doc/voms-proxy-init.xml b/doc/voms-proxy-init.xml index 7eaa65f6..3ca94dcb 100644 --- a/doc/voms-proxy-init.xml +++ b/doc/voms-proxy-init.xml @@ -96,7 +96,7 @@ Location of new proxy cert voms[:command] Specifies the VOMS server to contact using the nickname voms. It also allows to send a specific command +remap='I'>voms. It also allows one to send a specific command to the server. The default command is :all, and it gets all group membership information. @@ -171,7 +171,7 @@ This option targets the generated AC to a specific host. This hosts. seconds -This option allows to specify the maximum number of seconds that +This option allows one to specify the maximum number of seconds that voms-proxy-init will wait while trying to establish a connection with the server. Its default value is -1 (unlimited). diff --git a/doc/voms-proxy-list.1 b/doc/voms-proxy-list.1 index 5133bae5..32b7150c 100644 --- a/doc/voms-proxy-list.1 +++ b/doc/voms-proxy-list.1 @@ -28,7 +28,7 @@ .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" -voms-proxy-list \- Shows a list of all availabel attributes from a specified server +voms-proxy-list \- Shows a list of all available attributes from a specified server .SH "SYNOPSIS" .HP \w'\fBvoms\-proxy\-list\fR\ 'u \fBvoms\-proxy\-list\fR [options] diff --git a/doc/voms-proxy-list.xml b/doc/voms-proxy-list.xml index 7f9bc51e..41fa6153 100644 --- a/doc/voms-proxy-list.xml +++ b/doc/voms-proxy-list.xml @@ -16,7 +16,7 @@ voms-proxy-list -Shows a list of all availabel attributes from a specified server +Shows a list of all available attributes from a specified server diff --git a/doc/voms.8 b/doc/voms.8 index 5583a27e..64a5cfec 100644 --- a/doc/voms.8 +++ b/doc/voms.8 @@ -257,7 +257,7 @@ Higher values include all messages printed by lower ones, and values not documen \fB\-logformat\fR \fIstr\fR .PP -Sets the format used by the loggin system according toa printf\-like format string with the following directives format: +Sets the format used by the logging system according to a printf\-like format string with the following directives format: \fI\e%[size][char]\fR where size, if present, sets the maximum length of the field and \fIchar\fR @@ -464,7 +464,7 @@ This option specified the port on which the MySQL server is listening if it is d \fB\-mysql\-socket\fR \fIsocket\fR .PP -MySQL servers may be configured to allow access through a unix\-level socket\&. This option allows to specify this method of contact\&. However, it is almost always better to contact the server through the port\&. This option is ignored for Oracle backends\&. +MySQL servers may be configured to allow access through a unix\-level socket\&. This option allows one to specify this method of contact\&. However, it is almost always better to contact the server through the port\&. This option is ignored for Oracle backends\&. .PP \fB\-shortfqans\fR .PP diff --git a/doc/voms.xml b/doc/voms.xml index 0dc176b4..2ea6953e 100644 --- a/doc/voms.xml +++ b/doc/voms.xml @@ -187,7 +187,7 @@ overwrites the value of the option to 255. not documented here are translated as the highest level possible, LEV_DEBUG str -Sets the format used by the loggin system according toa printf-like +Sets the format used by the logging system according to a printf-like format string with the following directives format: \%[size][char] where size, if present, sets the maximum length of the field and char selects the type of substitution done. Possible values are the following: @@ -289,7 +289,7 @@ better to put what whould be the argument of this string into the socket MySQL servers may be configured to allow access through a - unix-level socket. This option allows to specify this method of + unix-level socket. This option allows one to specify this method of contact. However, it is almost always better to contact the server through the port. This option is ignored for Oracle backends. diff --git a/src/client/vomsclient.cc b/src/client/vomsclient.cc index 6e5d74f2..3c6221ab 100644 --- a/src/client/vomsclient.cc +++ b/src/client/vomsclient.cc @@ -262,7 +262,7 @@ Client::Client(int argc, char ** argv) : " -globus Globus version. (MajorMinor)\n" \ " -proxyver Version of proxy certificate.\n" \ " -noregen Use existing proxy certificate to connect to server and sign the new proxy.\n" \ - " -separate Saves the informations returned by the server on file .\n" \ + " -separate Saves the information returned by the server on file .\n" \ " -ignorewarn Ignore warnings.\n" \ " -failonwarn Treat warnings as errors.\n" \ " -list Show all available attributes.\n" \ diff --git a/src/common/failure.c b/src/common/failure.c index a245e05c..5ca51b05 100644 --- a/src/common/failure.c +++ b/src/common/failure.c @@ -150,7 +150,7 @@ void signal_segv(int signum, siginfo_t* info, void*ptr) fclose(outfile); - fprintf(stderr, "Segmentation Fault!\nThe program had a serious failure.\nIf you wish to help the developers fix it,\nplease send the /tmp/sigsegv_report file\n to a@cnaf.infn.it.\nThe file contains no personally identifying informations.\nThanks for your help!\n"); + fprintf(stderr, "Segmentation Fault!\nThe program had a serious failure.\nIf you wish to help the developers fix it,\nplease send the /tmp/sigsegv_report file\n to a@cnaf.infn.it.\nThe file contains no personally identifying information.\nThanks for your help!\n"); _exit (-1); } diff --git a/src/replica/voms_replica_master_setup.sh b/src/replica/voms_replica_master_setup.sh index aad5379e..54d7cd1d 100755 --- a/src/replica/voms_replica_master_setup.sh +++ b/src/replica/voms_replica_master_setup.sh @@ -223,7 +223,7 @@ fi fi -echo "Send these informations to the administrator of the slave server:" +echo "Send this information to the administrator of the slave server:" echo "Log File : $master_log_file" echo "Log Position: $master_log_pos" echo "Account name: $mysql_replica_user" diff --git a/src/server/vomsd.cc b/src/server/vomsd.cc index 4f4d1f74..09ea7fa6 100644 --- a/src/server/vomsd.cc +++ b/src/server/vomsd.cc @@ -805,7 +805,7 @@ void VOMSServer::Run() return; } - LOGM(VARP, logh, LEV_INFO, T_PRE, "SSL handshake completed succesfully."); + LOGM(VARP, logh, LEV_INFO, T_PRE, "SSL handshake completed successfully."); std::string user = sock.peer_subject; std::string userca = sock.peer_ca; @@ -874,7 +874,7 @@ bool VOMSServer::makeAC(vomsresult& vr, EVP_PKEY *key, X509 *issuer, if (!XML_Req_Decode(message, r)) { LOGM(VARP, logh, LEV_ERROR, T_PRE, "Unable to interpret command: %s",message.c_str()); - vr.setError(ERR_NO_COMMAND, "Unable to intepret command: " + message); + vr.setError(ERR_NO_COMMAND, "Unable to interpret command: " + message); return false; } diff --git a/src/utils/voms_verify.cc b/src/utils/voms_verify.cc index 491a4f27..19924dd8 100644 --- a/src/utils/voms_verify.cc +++ b/src/utils/voms_verify.cc @@ -215,7 +215,7 @@ int main(int argc, char* argv[]){ exit(-1); } - printf("Certificate chain verified succesfully\n"); + printf("Certificate chain verified successfully\n"); return 0; } diff --git a/src/utils/vomsfake.cc b/src/utils/vomsfake.cc index 3817bdfe..31e70855 100644 --- a/src/utils/vomsfake.cc +++ b/src/utils/vomsfake.cc @@ -236,7 +236,7 @@ Fake::Fake(int argc, char ** argv) : confile(conf_file_name), " -proxyver Version of proxy certificate.\n" \ " -rfc Create RFC-conforming proxies (synonim of --proxyver 4)\n" " -noregen Doesn't regenerate a new proxy for the connection.\n" \ - " -separate Saves the informations returned by the server on file .\n" \ + " -separate Saves the information returned by the server on file .\n" \ " -hostcert Fake host certificate.\n" \ " -hostkey Fake host private key.\n" \ " -fqan String to include in the AC as the granted FQAN.\n" \ diff --git a/testsuite/voms/voms/voms088.exp b/testsuite/voms/voms/voms088.exp index ac865fde..8ae9b4c9 100644 --- a/testsuite/voms/voms/voms088.exp +++ b/testsuite/voms/voms/voms088.exp @@ -50,7 +50,7 @@ proc mytest {} { -globus Globus version. \(MajorMinor\) -proxyver Version of proxy certificate. -noregen Use existing proxy certificate to connect to server and sign the new proxy. - -separate Saves the informations returned by the server on file . + -separate Saves the information returned by the server on file . -ignorewarn Ignore warnings. -failonwarn Treat warnings as errors. -list Show all available attributes.